diff options
| author | David Abrahams <dave@boostpro.com> | 2011-03-03 00:19:34 -0800 |
|---|---|---|
| committer | Glenn Morris <rgm@gnu.org> | 2011-03-03 00:19:34 -0800 |
| commit | 31128af6a3b3455dcffd0cb17ed6a96a2a612fdf (patch) | |
| tree | 3c03439ded87a2db671dde8cf072a3222260f308 /lisp/vc/ediff-init.el | |
| parent | 4cabe815399447dfeb9a4b3304fc4fd225115a67 (diff) | |
| download | emacs-31128af6a3b3455dcffd0cb17ed6a96a2a612fdf.tar.gz emacs-31128af6a3b3455dcffd0cb17ed6a96a2a612fdf.tar.bz2 emacs-31128af6a3b3455dcffd0cb17ed6a96a2a612fdf.zip | |
ediff-init.el fix for bug#1821. (tiny change)
Tiny change; note that author said he placed it in the public domain.
(If this wasn't a tiny change, we would still need paperwork.)
* lisp/vc/ediff-init.el (ediff-use-faces, ediff-highlight-all-diffs):
Move ediff-defvar-local calls after defcustoms.
Diffstat (limited to 'lisp/vc/ediff-init.el')
| -rw-r--r-- | lisp/vc/ediff-init.el | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/lisp/vc/ediff-init.el b/lisp/vc/ediff-init.el index ff1f7f6b017..0d904ec85c4 100644 --- a/lisp/vc/ediff-init.el +++ b/lisp/vc/ediff-init.el @@ -560,7 +560,6 @@ See the documentation string of `ediff-focus-on-regexp-matches' for details.") :group 'ediff) -(ediff-defvar-local ediff-use-faces t "") (defcustom ediff-use-faces t "If t, differences are highlighted using faces, if device supports faces. If nil, differences are highlighted using ASCII flags, ediff-before-flag @@ -568,6 +567,7 @@ and ediff-after-flag. On a non-window system, differences are always highlighted using ASCII flags." :type 'boolean :group 'ediff-highlighting) +(ediff-defvar-local ediff-use-faces t "") ;; this indicates that diff regions are word-size, so fine diffs are ;; permanently nixed; used in ediff-windows-wordwise and ediff-regions-wordwise @@ -604,13 +604,13 @@ meaning of this variable." :type 'boolean :group 'ediff) -(ediff-defvar-local ediff-highlight-all-diffs t "") (defcustom ediff-highlight-all-diffs t "If nil, only the selected differences are highlighted. Otherwise, all difference regions are highlighted, but the selected region is shown in brighter colors." :type 'boolean :group 'ediff-highlighting) +(ediff-defvar-local ediff-highlight-all-diffs t "") ;; The suffix of the control buffer name. |