diff options
| author | Miles Bader <miles@gnu.org> | 2007-06-11 01:00:07 +0000 |
|---|---|---|
| committer | Miles Bader <miles@gnu.org> | 2007-06-11 01:00:07 +0000 |
| commit | 67f3ad67ee317226cb5d1bb139de0cfd883fdc5e (patch) | |
| tree | 58a0e1bea7a1d8728fd32e6127a44434e7eac006 /lisp/startup.el | |
| parent | d17cf4eb2024cf54e4a216312184665094ee3df4 (diff) | |
| parent | 2d715b39ea1c89066f469405d065dd1a6631d28e (diff) | |
| download | emacs-67f3ad67ee317226cb5d1bb139de0cfd883fdc5e.tar.gz | |
Merge from emacs--devo--0
Patches applied:
* emacs--devo--0 (patch 781-792)
- Update from CVS
- Merge from gnus--rel--5.10
- Merge from emacs--rel--22
* emacs--rel--22 (patch 33-41)
* gnus--rel--5.10 (patch 226-228)
- Update from CVS
Revision: emacs@sv.gnu.org/emacs--multi-tty--0--patch-21
Diffstat (limited to 'lisp/startup.el')
| -rw-r--r-- | lisp/startup.el | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/lisp/startup.el b/lisp/startup.el index b36c9f1cfc4..4c2ae272545 100644 --- a/lisp/startup.el +++ b/lisp/startup.el @@ -1295,7 +1295,7 @@ using the mouse.\n\n") (emacs-version) "\n" :face '(variable-pitch :height 0.5) - "Copyright (C) 2007 Free Software Foundation, Inc.") + emacs-copyright) (and auto-save-list-file-prefix ;; Don't signal an error if the ;; directory for auto-save-list files |