Compare commits
2 Commits
caf244ecda
...
1a42ee8563
Author | SHA1 | Date |
---|---|---|
TEC | 1a42ee8563 | |
TEC | 8c347101bf |
19
orgdiff.el
19
orgdiff.el
|
@ -155,10 +155,11 @@
|
|||
(if (memq major-mode '(magit-status-mode magit-log-mode))
|
||||
;; If in a magit buffer, set git revisions from state
|
||||
(setq orgdiff-git-revisions
|
||||
(substring-no-properties
|
||||
(or (--when-let (magit-region-values '(commit branch) t)
|
||||
(concat (car (last it)) ".." (car it)))
|
||||
(magit-branch-or-commit-at-point))))
|
||||
(let* ((commits (magit-region-values '(commit branch) t))
|
||||
(range (if commits
|
||||
(concat (car (last it)) ".." (car it))
|
||||
(magit-branch-or-commit-at-point))))
|
||||
(and range (substring-no-properties range))))
|
||||
;; Otherwise, just verify that the refs are valid
|
||||
(unless (or (null orgdiff-git-revisions)
|
||||
(cl-every #'magit-rev-verify-commit
|
||||
|
@ -278,11 +279,11 @@
|
|||
("--math-markup"
|
||||
(off . "Supress markup in math environments. Only show new version")
|
||||
(whole . "Any change causes the whole equation to be marked as changed")
|
||||
(coarse . ,(concat " Coarse granularity. Use when content and order being changed" (propertize "(default)" 'face 'shadow)))
|
||||
(coarse . ,(concat "Coarse granularity. Use when content and order being changed" (propertize " (default)" 'face 'shadow)))
|
||||
(fine . "Detect and mark up small changes. Suitable if minor changes (e.g. typo fixes) are expected"))
|
||||
("--graphics-markup"
|
||||
(off . "No highlighting for figures")
|
||||
(new-only . ,(concat " Surround new/changed figures with a blue frame" (propertize "(default)" 'face 'shadow)))
|
||||
(new-only . ,(concat "Surround new/changed figures with a blue frame" (propertize " (default)" 'face 'shadow)))
|
||||
(both . "Surround new/changed figures with a blue frame, and shrink and cross out deleted figures"))))
|
||||
|
||||
(defun orgdiff-latexdiff-prompt-flag (flag)
|
||||
|
@ -293,7 +294,7 @@
|
|||
(seq-max)))
|
||||
(options
|
||||
(mapcar (lambda (opt)
|
||||
(concat (propertize (symbol-name (car opt)) 'face 'font-lock-variable-name-face)
|
||||
(concat (propertize (symbol-name (car opt)) 'face 'transient-value)
|
||||
(make-string (- max-key-width (length (symbol-name (car opt))) -2) ? )
|
||||
(cdr opt)))
|
||||
(cdr (assoc flag orgdiff-latexdiff-flags))))
|
||||
|
@ -323,7 +324,7 @@
|
|||
'symbol 'SAFE
|
||||
(orgdiff-latexdiff-prompt-flag "--subtype"))
|
||||
(orgdiff--define-infix
|
||||
"-F" "latexdiff-floattype" "Float type"
|
||||
"-f" "latexdiff-floattype" "Float type"
|
||||
'symbol 'FLOATSAFE
|
||||
(orgdiff-latexdiff-prompt-flag "--floattype"))
|
||||
|
||||
|
@ -333,7 +334,7 @@
|
|||
(not orgdiff-latexdiff-flatten))
|
||||
|
||||
(orgdiff--define-infix
|
||||
"-s" "latexdiff-allow-spaces" "Allow spaces"
|
||||
"-S" "latexdiff-allow-spaces" "Allow spaces"
|
||||
'boolean nil
|
||||
(not orgdiff-latexdiff-allow-spaces))
|
||||
(orgdiff--define-infix
|
||||
|
|
Loading…
Reference in New Issue