aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJuri Linkov2007-11-10 21:21:03 +0000
committerJuri Linkov2007-11-10 21:21:03 +0000
commitad360c93569145287ebc964573a7dfcbe313850a (patch)
treef4b744c5ac77fa698ef7da95e02bfa24a3b3f1c8
parentc766ffaa57d89ba1f76b2707a83197271505d83e (diff)
downloademacs-ad360c93569145287ebc964573a7dfcbe313850a.tar.gz
emacs-ad360c93569145287ebc964573a7dfcbe313850a.zip
(emacs-copyright): Add emacs-copyright.
-rw-r--r--lisp/ChangeLog7
-rw-r--r--lisp/version.el3
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 @@
12007-11-10 Juri Linkov <juri@jurta.org>
2
3 * startup.el: Backport startup screen related changes from the trunk.
4 * loadup.el: Add `button'. Move up `startup'.
5 * help.el (help-map, help-for-help-internal): Add `C-h C-a'.
6 * version.el (emacs-copyright): Add emacs-copyright.
7
12007-11-10 Jason Rumney <jasonr@gnu.org> 82007-11-10 Jason Rumney <jasonr@gnu.org>
2 9
3 * w32-fns.el: Sync charset names with setup-default-fontset. 10 * 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 @@
27 27
28;;; Code: 28;;; Code:
29 29
30(defconst emacs-copyright "Copyright (C) 2007 Free Software Foundation, Inc."
31 "Short copyright string for this version of Emacs.")
32
30(defconst emacs-version "22.1.50" "\ 33(defconst emacs-version "22.1.50" "\
31Version numbers of this version of Emacs.") 34Version numbers of this version of Emacs.")
32 35