diff options
| author | Stefan Monnier | 2005-01-28 16:27:13 +0000 |
|---|---|---|
| committer | Stefan Monnier | 2005-01-28 16:27:13 +0000 |
| commit | f9475d97eec72a62b179f98eb086a406f6c44101 (patch) | |
| tree | e2b00137e2764b059ab248ee22d2c5e60baa02b0 | |
| parent | 996f9cdebb49d38bd5b0718d1a0f9f2479ef077a (diff) | |
| download | emacs-f9475d97eec72a62b179f98eb086a406f6c44101.tar.gz emacs-f9475d97eec72a62b179f98eb086a406f6c44101.zip | |
(eval-defun-1): Make sure `defvar' always sets the default value.
| -rw-r--r-- | lisp/emacs-lisp/lisp-mode.el | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/lisp/emacs-lisp/lisp-mode.el b/lisp/emacs-lisp/lisp-mode.el index f181f3683f0..86c3ac1bab4 100644 --- a/lisp/emacs-lisp/lisp-mode.el +++ b/lisp/emacs-lisp/lisp-mode.el | |||
| @@ -1,6 +1,6 @@ | |||
| 1 | ;;; lisp-mode.el --- Lisp mode, and its idiosyncratic commands | 1 | ;;; lisp-mode.el --- Lisp mode, and its idiosyncratic commands |
| 2 | 2 | ||
| 3 | ;; Copyright (C) 1985, 1986, 1999, 2000, 2001, 2003, 2004 | 3 | ;; Copyright (C) 1985, 1986, 1999, 2000, 2001, 2003, 2004, 2005 |
| 4 | ;; Free Software Foundation, Inc. | 4 | ;; Free Software Foundation, Inc. |
| 5 | 5 | ||
| 6 | ;; Maintainer: FSF | 6 | ;; Maintainer: FSF |
| @@ -602,7 +602,7 @@ Reinitialize the face according to the `defface' specification." | |||
| 602 | (boundp (cadr form))) | 602 | (boundp (cadr form))) |
| 603 | ;; Force variable to be re-set. | 603 | ;; Force variable to be re-set. |
| 604 | `(progn (defvar ,(nth 1 form) nil ,@(nthcdr 3 form)) | 604 | `(progn (defvar ,(nth 1 form) nil ,@(nthcdr 3 form)) |
| 605 | (setq ,(nth 1 form) ,(nth 2 form)))) | 605 | (setq-default ,(nth 1 form) ,(nth 2 form)))) |
| 606 | ;; `defcustom' is now macroexpanded to | 606 | ;; `defcustom' is now macroexpanded to |
| 607 | ;; `custom-declare-variable' with a quoted value arg. | 607 | ;; `custom-declare-variable' with a quoted value arg. |
| 608 | ((and (eq (car form) 'custom-declare-variable) | 608 | ((and (eq (car form) 'custom-declare-variable) |