[Emacs-diffs] /srv/bzr/emacs/trunk r107370: Tiny emerge-defvar-local fix

[Glenn Morris]

------------------------------------------------------------
revno: 107370
committer: Glenn Morris <address@hidden>
branch nick: trunk
timestamp: Tue 2012-02-21 17:23:51 -0500
message:
  Tiny emerge-defvar-local fix
  
  * lisp/vc/emerge.el (emerge-defvar-local):
  Set `permanent-local' property rather than unused `preserved'.
modified:
  lisp/ChangeLog
  lisp/vc/emerge.el

=== modified file 'lisp/ChangeLog'
--- a/lisp/ChangeLog    2012-02-21 17:33:16 +0000
+++ b/lisp/ChangeLog    2012-02-21 22:23:51 +0000
@@ -1,5 +1,8 @@
 2012-02-21  Glenn Morris  <address@hidden>
 
+       * 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.

=== modified file 'lisp/vc/emerge.el'
--- a/lisp/vc/emerge.el 2011-12-17 06:51:13 +0000
+++ b/lisp/vc/emerge.el 2012-02-21 22:23:51 +0000
@@ -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