mirror of
git://git.sv.gnu.org/emacs.git
synced 2026-02-23 05:17:35 +00:00
Tiny emerge-defvar-local fix
* lisp/vc/emerge.el (emerge-defvar-local): Set `permanent-local' property rather than unused `preserved'.
This commit is contained in:
parent
68af8d4fc3
commit
6ff86ec481
2 changed files with 5 additions and 2 deletions
|
|
@ -1,5 +1,8 @@
|
|||
2012-02-21 Glenn Morris <rgm@gnu.org>
|
||||
|
||||
* vc/emerge.el (emerge-defvar-local):
|
||||
Set `permanent-local' property rather than unused `preserved'.
|
||||
|
||||
* textmodes/picture.el (picture-delete-char): New alias.
|
||||
(picture-mode-map): Use it. (Bug#10860)
|
||||
(picture-mode): Doc fix.
|
||||
|
|
|
|||
|
|
@ -39,13 +39,13 @@
|
|||
(defmacro emerge-defvar-local (var value doc)
|
||||
"Defines SYMBOL as an advertised variable.
|
||||
Performs a defvar, then executes `make-variable-buffer-local' on
|
||||
the variable. Also sets the `preserved' property, so that
|
||||
the variable. Also sets the `permanent-local' property, so that
|
||||
`kill-all-local-variables' (called by major-mode setting commands)
|
||||
won't destroy Emerge control variables."
|
||||
`(progn
|
||||
(defvar ,var ,value ,doc)
|
||||
(make-variable-buffer-local ',var)
|
||||
(put ',var 'preserved t)))
|
||||
(put ',var 'permanent-local t)))
|
||||
|
||||
;; Add entries to minor-mode-alist so that emerge modes show correctly
|
||||
(defvar emerge-minor-modes-list
|
||||
|
|
|
|||
Loading…
Reference in a new issue