diff options
| author | Richard M. Stallman <rms@gnu.org> | 2002-02-01 03:59:17 +0000 |
|---|---|---|
| committer | Richard M. Stallman <rms@gnu.org> | 2002-02-01 03:59:17 +0000 |
| commit | 024ab5b50476c6bf0d3bd1ddf1cd9d0aef2cdda6 (patch) | |
| tree | 66a8763fd2e85ec3691d747b5e9cf0f407f50e30 /lisp/emulation/pc-select.el | |
| parent | f95c4fe5fafb503c73c6bad52e754e36159fe74b (diff) | |
| download | emacs-024ab5b50476c6bf0d3bd1ddf1cd9d0aef2cdda6.tar.gz | |
(pc-select-save-and-set-mode): Properly use MODE-VAR.
Diffstat (limited to 'lisp/emulation/pc-select.el')
| -rw-r--r-- | lisp/emulation/pc-select.el | 17 |
1 files changed, 8 insertions, 9 deletions
diff --git a/lisp/emulation/pc-select.el b/lisp/emulation/pc-select.el index 90865f2bdee..aa5070647a3 100644 --- a/lisp/emulation/pc-select.el +++ b/lisp/emulation/pc-select.el @@ -785,8 +785,8 @@ cdr of that cell with VAL. Otherwise, make a new cons cell "Set VAR to NEWVAL; save the old value. The old value is saved on the `pc-select-saved-settings-alist'." `(when (boundp ',var) - (pc-select-add-to-alist pc-select-saved-settings-alist ,var ,var) - (setq ,var ,newval))) + (pc-select-add-to-alist pc-select-saved-settings-alist ,var ,var) + (setq ,var ,newval))) (defmacro pc-select-save-and-set-mode (mode &optional arg mode-var) "Call the function MODE; save the old value of the variable MODE. @@ -796,12 +796,11 @@ Then, if ARG is specified, call MODE with ARG, otherwise call it with nil as an argument. If MODE-VAR is specified, save the value of the variable MODE-VAR (instead of the value of the variable MODE) on `pc-select-saved-settings-alist'." - `(when (fboundp ',mode) - (pc-select-add-to-alist pc-select-saved-settings-alist - ,mode - (or (and (boundp ',mode) ,mode) - ,mode-var)) - (,mode ,arg))) + (unless mode-var (setq mode-var mode)) + `(when (fboundp ',mode) + (pc-select-add-to-alist pc-select-saved-settings-alist + ,mode-var ,mode-var) + (,mode ,arg))) (defmacro pc-select-restore-var (var) "Restore the previous value of the variable VAR. @@ -821,7 +820,7 @@ If the value is non-nil, call the function MODE with an argument of `(when (fboundp ',mode) (let ((,elt (assq ',mode pc-select-saved-settings-alist))) (unless (null ,elt) - (,mode (if (cdr ,elt) 1 -1))))))) + (,mode (if (cdr ,elt) 1 -1))))))) ;;;###autoload |