Commit 5bcad689 authored by Glenn Morris's avatar Glenn Morris

* 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
parent 9b0c01f7
2014-02-14 Michael R. Mauger <michael@mauger.com>
2014-02-16 Glenn Morris <rgm@gnu.org>
* 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 <michael@mauger.com>
* progmodes/sql.el: Version 3.4
(sql-oracle-options): New default value ("-L").
......
......@@ -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.
......
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