diff options
| -rw-r--r-- | lisp/ChangeLog | 7 | ||||
| -rw-r--r-- | lisp/version.el | 3 |
2 files changed, 10 insertions, 0 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog index 4b45a9afe87..57e6d1dd9c3 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog @@ -1,3 +1,10 @@ +2007-11-10 Juri Linkov <juri@jurta.org> + + * startup.el: Backport startup screen related changes from the trunk. + * loadup.el: Add `button'. Move up `startup'. + * help.el (help-map, help-for-help-internal): Add `C-h C-a'. + * version.el (emacs-copyright): Add emacs-copyright. + 2007-11-10 Jason Rumney <jasonr@gnu.org> * w32-fns.el: Sync charset names with setup-default-fontset. diff --git a/lisp/version.el b/lisp/version.el index 1657dc0e270..9b6f06f2eff 100644 --- a/lisp/version.el +++ b/lisp/version.el @@ -27,6 +27,9 @@ ;;; Code: +(defconst emacs-copyright "Copyright (C) 2007 Free Software Foundation, Inc." + "Short copyright string for this version of Emacs.") + (defconst emacs-version "22.1.50" "\ Version numbers of this version of Emacs.") |