diff options
| author | Thien-Thi Nguyen <[email protected]> | 2008-07-21 14:20:24 +0000 |
|---|---|---|
| committer | Thien-Thi Nguyen <[email protected]> | 2008-07-21 14:20:24 +0000 |
| commit | 7381be9dcb83efae4f0645d49a55cc38f13cb9c8 (patch) | |
| tree | 4baf43e83b8ace9329e25b3c6ccf622e5641553d /lisp/smerge-mode.el | |
| parent | b737c3d96807ae991ab90808d5c090f41a202e3d (diff) | |
Make auto-refining a minor mode, and diff- and smerge- use it.
* 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.
Diffstat (limited to 'lisp/smerge-mode.el')
| -rw-r--r-- | lisp/smerge-mode.el | 9 |
1 files changed, 2 insertions, 7 deletions
diff --git a/lisp/smerge-mode.el b/lisp/smerge-mode.el index 6489133e12..169f500826 100644 --- a/lisp/smerge-mode.el +++ b/lisp/smerge-mode.el @@ -44,7 +44,7 @@ ;;; Code: -(eval-when-compile (require 'cl)) +(eval-when-compile (require 'cl) (require 'diff-mode)) ;;; The real definition comes later. @@ -77,11 +77,6 @@ Used in `smerge-diff-base-mine' and related functions." :group 'smerge :type 'boolean) -(defcustom smerge-auto-refine t - "Automatically highlight changes in detail as the user visits conflicts." - :group 'smerge - :type 'boolean) - (defface smerge-mine '((((min-colors 88) (background light)) (:foreground "blue1")) @@ -259,7 +254,7 @@ Can be nil if the style is undecided, or else: ;; Define smerge-next and smerge-prev (easy-mmode-define-navigation smerge smerge-begin-re "conflict" nil nil - (if smerge-auto-refine + (if diff-auto-refine-mode (condition-case nil (smerge-refine) (error nil)))) (defconst smerge-match-names ["conflict" "mine" "base" "other"]) |