diff options
| author | Glenn Morris | 2012-02-21 17:23:51 -0500 |
|---|---|---|
| committer | Glenn Morris | 2012-02-21 17:23:51 -0500 |
| commit | 6ff86ec481dc43f9cfcc5476e3cd82d1e2b89418 (patch) | |
| tree | 1e6b2b5282a2bef4c1f46ac7da580dcd9936f9bb /lisp/vc | |
| parent | 68af8d4fc3bcdf9c9123f66283d0005cf91e34b0 (diff) | |
| download | emacs-6ff86ec481dc43f9cfcc5476e3cd82d1e2b89418.tar.gz emacs-6ff86ec481dc43f9cfcc5476e3cd82d1e2b89418.zip | |
Tiny emerge-defvar-local fix
* lisp/vc/emerge.el (emerge-defvar-local):
Set `permanent-local' property rather than unused `preserved'.
Diffstat (limited to 'lisp/vc')
| -rw-r--r-- | lisp/vc/emerge.el | 4 |
1 files changed, 2 insertions, 2 deletions
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 @@ | |||
| 39 | (defmacro emerge-defvar-local (var value doc) | 39 | (defmacro emerge-defvar-local (var value doc) |
| 40 | "Defines SYMBOL as an advertised variable. | 40 | "Defines SYMBOL as an advertised variable. |
| 41 | Performs a defvar, then executes `make-variable-buffer-local' on | 41 | Performs a defvar, then executes `make-variable-buffer-local' on |
| 42 | the variable. Also sets the `preserved' property, so that | 42 | the variable. Also sets the `permanent-local' property, so that |
| 43 | `kill-all-local-variables' (called by major-mode setting commands) | 43 | `kill-all-local-variables' (called by major-mode setting commands) |
| 44 | won't destroy Emerge control variables." | 44 | won't destroy Emerge control variables." |
| 45 | `(progn | 45 | `(progn |
| 46 | (defvar ,var ,value ,doc) | 46 | (defvar ,var ,value ,doc) |
| 47 | (make-variable-buffer-local ',var) | 47 | (make-variable-buffer-local ',var) |
| 48 | (put ',var 'preserved t))) | 48 | (put ',var 'permanent-local t))) |
| 49 | 49 | ||
| 50 | ;; Add entries to minor-mode-alist so that emerge modes show correctly | 50 | ;; Add entries to minor-mode-alist so that emerge modes show correctly |
| 51 | (defvar emerge-minor-modes-list | 51 | (defvar emerge-minor-modes-list |