From 5bcad689ca6a4bc18d5263f62164705b54b5e7a9 Mon Sep 17 00:00:00 2001 From: Glenn Morris Date: Sat, 15 Feb 2014 19:09:27 -0800 Subject: [PATCH] * lisp/vc/ediff-init.el (ediff-use-faces, ediff-highlight-all-diffs): Do not use ediff-defvar-local on pre-defined variables. Fixes: debbugs:16744 --- lisp/ChangeLog | 7 ++++++- lisp/vc/ediff-init.el | 6 ++++-- 2 files changed, 10 insertions(+), 3 deletions(-) diff --git a/lisp/ChangeLog b/lisp/ChangeLog index b1fe2507a8a..32df40bd094 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog @@ -1,4 +1,9 @@ -2014-02-14 Michael R. Mauger +2014-02-16 Glenn Morris + + * 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 * progmodes/sql.el: Version 3.4 (sql-oracle-options): New default value ("-L"). diff --git a/lisp/vc/ediff-init.el b/lisp/vc/ediff-init.el index 06bbc47b61e..000fdb916e3 100644 --- a/lisp/vc/ediff-init.el +++ b/lisp/vc/ediff-init.el @@ -567,7 +567,8 @@ 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 "") +(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 @@ 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 "") +(make-variable-buffer-local 'ediff-highlight-all-diffs) +(put 'ediff-highlight-all-diffs 'permanent-local t) ;; The suffix of the control buffer name. -- 2.11.4.GIT