diff options
| author | Miles Bader <miles@gnu.org> | 2005-01-29 00:06:24 +0000 |
|---|---|---|
| committer | Miles Bader <miles@gnu.org> | 2005-01-29 00:06:24 +0000 |
| commit | 5f85994ad17fbe952504bfafb49fbef4ded186af (patch) | |
| tree | 33522e4a7a8ddc7c7efa704bd6264f9722ad4ce8 /lisp/emacs-lisp | |
| parent | 87795686a9e8ea51ec492d01d7dce4698b14f3af (diff) | |
| parent | aba1948af5107ad44c467e4f97792af5ce75a7d7 (diff) | |
| download | emacs-5f85994ad17fbe952504bfafb49fbef4ded186af.tar.gz emacs-5f85994ad17fbe952504bfafb49fbef4ded186af.tar.bz2 emacs-5f85994ad17fbe952504bfafb49fbef4ded186af.zip | |
Revision: miles@gnu.org--gnu-2005/emacs--unicode--0--patch-7
Merge from emacs--cvs-trunk--0
Patches applied:
* miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-52
- miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-53
Update from CVS
* miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-54
Update from CVS: lisp/cus-start.el (all): Add `undo-outer-limit'.
* miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-55
- miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-57
Update from CVS
* miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-58
Merge from gnus--rel--5.10
* miles@gnu.org--gnu-2005/gnus--rel--5.10--patch-7
Merge from emacs--cvs-trunk--0
* miles@gnu.org--gnu-2005/gnus--rel--5.10--patch-8
- miles@gnu.org--gnu-2005/gnus--rel--5.10--patch-11
Update from CVS
Diffstat (limited to 'lisp/emacs-lisp')
| -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 @@ ;;; 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 @@ Reinitialize the face according to the `defface' specification." (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) |