From: Glenn Morris <rgm@gnu.org>
Date: Tue, 21 Feb 2012 22:23:51 +0000 (-0500)
Subject: Tiny emerge-defvar-local fix
X-Git-Tag: emacs-pretest-24.0.94~75
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=6ff86ec481dc43f9cfcc5476e3cd82d1e2b89418;p=emacs.git

Tiny emerge-defvar-local fix

* lisp/vc/emerge.el (emerge-defvar-local):
Set `permanent-local' property rather than unused `preserved'.
---

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 083a953cc03..8bedc86ce88 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 bc4b0725c4e..a48f2afecd5 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