diff options
| -rw-r--r-- | lisp/ChangeLog | 3 | ||||
| -rw-r--r-- | lisp/vc/emerge.el | 4 |
2 files changed, 5 insertions, 2 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog index 083a953cc0..8bedc86ce8 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog @@ -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. diff --git a/lisp/vc/emerge.el b/lisp/vc/emerge.el index bc4b0725c4..a48f2afecd 100644 --- a/lisp/vc/emerge.el +++ b/lisp/vc/emerge.el @@ -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 |