Mercurial > emacs
diff lisp/smerge-mode.el @ 96854:b9de9e7dceed
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.
author | Thien-Thi Nguyen <ttn@gnuvola.org> |
---|---|
date | Mon, 21 Jul 2008 14:20:24 +0000 |
parents | 4ea0e968c7af |
children | 35155d8e5360 |
line wrap: on
line diff
--- a/lisp/smerge-mode.el Mon Jul 21 07:27:52 2008 +0000 +++ b/lisp/smerge-mode.el Mon Jul 21 14:20:24 2008 +0000 @@ -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 @@ :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 @@ ;; 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"])