Commit 31128af6 authored by David Abrahams's avatar David Abrahams Committed by Glenn Morris
Browse files

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.
parent 4cabe815
2011-03-03 David Abrahams <> (tiny change)
* vc/ediff-init.el (ediff-use-faces, ediff-highlight-all-diffs):
Move ediff-defvar-local calls after defcustoms. (Bug#1821)
2011-03-03 Glenn Morris <>
* files.el (file-truename): Doc fix. (Bug#2341)
......@@ -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.
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment