Mercurial > emacs
changeset 59755:c4bcae7d90b4
(eval-defun-1): Make sure `defvar' always sets the default value.
| author | Stefan Monnier <monnier@iro.umontreal.ca> |
|---|---|
| date | Fri, 28 Jan 2005 16:27:13 +0000 |
| parents | a9fbaec66c84 |
| children | b53453586872 |
| files | lisp/emacs-lisp/lisp-mode.el |
| diffstat | 1 files changed, 2 insertions(+), 2 deletions(-) [+] |
line wrap: on
line diff
--- a/lisp/emacs-lisp/lisp-mode.el Fri Jan 28 16:25:10 2005 +0000 +++ b/lisp/emacs-lisp/lisp-mode.el Fri Jan 28 16:27:13 2005 +0000 @@ -1,6 +1,6 @@ ;;; lisp-mode.el --- Lisp mode, and its idiosyncratic commands -;; Copyright (C) 1985, 1986, 1999, 2000, 2001, 2003, 2004 +;; Copyright (C) 1985, 1986, 1999, 2000, 2001, 2003, 2004, 2005 ;; Free Software Foundation, Inc. ;; Maintainer: FSF @@ -602,7 +602,7 @@ (boundp (cadr form))) ;; Force variable to be re-set. `(progn (defvar ,(nth 1 form) nil ,@(nthcdr 3 form)) - (setq ,(nth 1 form) ,(nth 2 form)))) + (setq-default ,(nth 1 form) ,(nth 2 form)))) ;; `defcustom' is now macroexpanded to ;; `custom-declare-variable' with a quoted value arg. ((and (eq (car form) 'custom-declare-variable)