Github/emacs
2
0
Fork 1
mirror of git://git.sv.gnu.org/emacs.git synced 2026-02-16 17:24:23 +00:00
Code Issues Projects Releases Packages Wiki Activity

* lisp/vc/ediff-init.el (ediff-use-faces, ediff-highlight-all-diffs):

Browse source 
Do not use ediff-defvar-local on pre-defined variables.

Fixes: debbugs:16744
This commit is contained in:
Glenn Morris 2014-02-15 19:09:27 -08:00
parent 9b0c01f7f5
commit 5bcad689ca
2 changed files with 10 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
lisp/ChangeLog
View file

@ -1,4 +1,9 @@
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").

6
lisp/vc/ediff-init.el
View file

@ -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.