[Emacs-diffs] /srv/bzr/emacs/trunk r103499: ediff-init.el fix for bug#1821. (tiny change)

[Glenn Morris]

------------------------------------------------------------
revno: 103499
author: David Abrahams <address@hidden>
committer: Glenn Morris <address@hidden>
branch nick: trunk
timestamp: Thu 2011-03-03 00:19:34 -0800
message:
  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.
modified:
  lisp/ChangeLog
  lisp/vc/ediff-init.el

=== modified file 'lisp/ChangeLog'
--- a/lisp/ChangeLog    2011-03-03 08:10:52 +0000
+++ b/lisp/ChangeLog    2011-03-03 08:19:34 +0000
@@ -1,3 +1,8 @@
+2011-03-03  David Abrahams  <address@hidden>  (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  <address@hidden>
 
        * files.el (file-truename): Doc fix.  (Bug#2341)

=== modified file 'lisp/vc/ediff-init.el'
--- a/lisp/vc/ediff-init.el     2011-01-25 04:08:28 +0000
+++ b/lisp/vc/ediff-init.el     2011-03-03 08:19:34 +0000
@@ -560,7 +560,6 @@
   :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 @@
 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 @@
   :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.