procyberian/emacs
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Make auto-refining a minor mode, and diff- and smerge- use it.

Browse source 
* diff-mode.el (diff-auto-refine): Delete defcustom.
(diff-auto-refine-mode): New func/var via define-minor-mode.
Update var ref to use diff-auto-refine-mode.
* smerge-mode.el (diff-mode): Require when compiling.
(smerge-auto-refine): Delete defcustom.
Update smerge-auto-refine ref to use diff-auto-refine-mode.
This commit is contained in:
Thien-Thi Nguyen 2008-07-21 14:20:24 +00:00
parent b737c3d968
commit 7381be9dcb
4 changed files with 22 additions and 15 deletions
Download patch file Download diff file Expand all files Collapse all files

14
lisp/diff-mode.el
View file

@ -91,11 +91,6 @@ when editing big diffs)."
:type 'boolean
:group 'diff-mode)
(defcustom diff-auto-refine t
"Automatically highlight changes in detail as the user visits hunks."
:type 'boolean
:group 'diff-mode)
(defcustom diff-mode-hook nil
"Run after setting up the `diff-mode' major mode."
:type 'hook
@ -220,6 +215,13 @@ when editing big diffs)."
`((,diff-minor-mode-prefix . ,diff-mode-shared-map))
"Keymap for `diff-minor-mode'. See also `diff-mode-shared-map'.")
(define-minor-mode diff-auto-refine-mode
"Automatically highlight changes in detail as the user visits hunks.
When transitioning from disabled to enabled,
try to refine the current hunk, as well."
:group 'diff-mode :init-value t :lighter " Auto-Refine"
(when diff-auto-refine-mode
(condition-case-no-debug nil (diff-refine-hunk) (error nil))))
;;;;
;;;; font-lock support
@ -528,7 +530,7 @@ but in the file header instead, in which case move forward to the first hunk."
;; Define diff-{hunk,file}-{prev,next}
(easy-mmode-define-navigation
diff-hunk diff-hunk-header-re "hunk" diff-end-of-hunk diff-restrict-view
(if diff-auto-refine
(if diff-auto-refine-mode
(condition-case-no-debug nil (diff-refine-hunk) (error nil))))
(easy-mmode-define-navigation