Commit 6ff86ec4 authored by Glenn Morris's avatar Glenn Morris
Browse files

Tiny emerge-defvar-local fix

* lisp/vc/emerge.el (emerge-defvar-local):
Set `permanent-local' property rather than unused `preserved'.
parent 68af8d4f
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
......
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