(emacs-copyright): Add emacs-copyright.

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 4b45a9afe877f928a1269f8238d8962d2616b36d..57e6d1dd9c33d49c77832e6775db94e01ec1358a 100644 (file)
--- 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 1657dc0e270173fe0a5d56b4bfee1fc419d8e881..9b6f06f2eff3d92000070e85d01ed4c42a0c25c4 100644 (file)
--- 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.")