[Emacs-diffs] trunk r116448: * lisp/vc/ediff-init.el (ediff-use-faces, ediff-highlight-all-diffs):

[Glenn Morris]

------------------------------------------------------------
revno: 116448
revision-id: address@hidden
parent: address@hidden
fixes bug: http://debbugs.gnu.org/16744
committer: Glenn Morris <address@hidden>
branch nick: trunk
timestamp: Sat 2014-02-15 19:09:27 -0800
message:
  * lisp/vc/ediff-init.el (ediff-use-faces, ediff-highlight-all-diffs):
  Do not use ediff-defvar-local on pre-defined variables.
modified:
  lisp/ChangeLog                 changelog-20091113204419-o5vbwnq5f7feedwu-1432
  lisp/vc/ediff-init.el          
ediffinit.el-20091113204419-o5vbwnq5f7feedwu-846

=== modified file 'lisp/ChangeLog'
--- a/lisp/ChangeLog    2014-02-15 22:50:45 +0000
+++ b/lisp/ChangeLog    2014-02-16 03:09:27 +0000
@@ -1,4 +1,9 @@
-2014-02-14  Michael R. Mauger  <address@hidden>
+2014-02-16  Glenn Morris  <address@hidden>
+
+       * vc/ediff-init.el (ediff-use-faces, ediff-highlight-all-diffs):
+       Do not use ediff-defvar-local on pre-defined variables.  (Bug#16744)
+
+2014-02-15  Michael R. Mauger  <address@hidden>
 
        * progmodes/sql.el: Version 3.4
        (sql-oracle-options): New default value ("-L").

=== modified file 'lisp/vc/ediff-init.el'
--- a/lisp/vc/ediff-init.el     2014-01-01 07:43:34 +0000
+++ b/lisp/vc/ediff-init.el     2014-02-16 03:09:27 +0000
@@ -567,7 +567,8 @@
 highlighted using ASCII flags."
   :type 'boolean
   :group 'ediff-highlighting)
-(ediff-defvar-local ediff-use-faces t "")
+(make-variable-buffer-local 'ediff-use-faces)
+(put 'ediff-use-faces 'permanent-local t)
 
 ;; this indicates that diff regions are word-size, so fine diffs are
 ;; permanently nixed; used in ediff-windows-wordwise and ediff-regions-wordwise
@@ -610,7 +611,8 @@
 shown in brighter colors."
   :type 'boolean
   :group 'ediff-highlighting)
-(ediff-defvar-local ediff-highlight-all-diffs t "")
+(make-variable-buffer-local 'ediff-highlight-all-diffs)
+(put 'ediff-highlight-all-diffs 'permanent-local t)
 
 
 ;; The suffix of the control buffer name.