aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorGerd Moellmann2000-06-15 12:00:39 +0000
committerGerd Moellmann2000-06-15 12:00:39 +0000
commite27e8d71b43d753945ea4136458a29700647c15c (patch)
treea186ddc0963d9472c29a2ac1850ec686dc41debb
parent28223a7ebc34af3c5b03fcd4b907cf426da2b469 (diff)
downloademacs-e27e8d71b43d753945ea4136458a29700647c15c.tar.gz
emacs-e27e8d71b43d753945ea4136458a29700647c15c.zip
(command-line-1): Change copyright messages to year
2000.
-rw-r--r--lisp/ChangeLog7
-rw-r--r--lisp/startup.el4
2 files changed, 8 insertions, 3 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index a864949c18f..505e300bdac 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,8 @@
12000-06-15 Gerd Moellmann <gerd@gnu.org>
2
3 * startup.el (command-line-1): Change copyright messages to year
4 2000.
5
12000-06-15 Dave Love <fx@gnu.org> 62000-06-15 Dave Love <fx@gnu.org>
2 7
3 * net/goto-addr.el (goto-address-fontify): Use keymap property, 8 * net/goto-addr.el (goto-address-fontify): Use keymap property,
@@ -10,7 +15,7 @@
10 15
112000-06-14 Gerd Moellmann <gerd@gnu.org> 162000-06-14 Gerd Moellmann <gerd@gnu.org>
12 17
13 * Makefile.in (VPATH): New file. 18 * Makefile.in: New file.
14 19
15 * Makefile: Removed. 20 * Makefile: Removed.
16 21
diff --git a/lisp/startup.el b/lisp/startup.el
index 0c92c4b6a13..a51fd018c64 100644
--- a/lisp/startup.el
+++ b/lisp/startup.el
@@ -898,7 +898,7 @@ Getting New Versions How to obtain the latest version of Emacs.
898") 898")
899 (insert "\n\n" (emacs-version) 899 (insert "\n\n" (emacs-version)
900 " 900 "
901Copyright (C) 1999 Free Software Foundation, Inc.")) 901Copyright (C) 2000 Free Software Foundation, Inc."))
902 ;; If keys have their default meanings, 902 ;; If keys have their default meanings,
903 ;; use precomputed string to save lots of time. 903 ;; use precomputed string to save lots of time.
904 (if (and (eq (key-binding "\C-h") 'help-command) 904 (if (and (eq (key-binding "\C-h") 'help-command)
@@ -960,7 +960,7 @@ If you have no Meta key, you may instead type ESC followed by the character.)")
960 960
961 (insert "\n\n" (emacs-version) 961 (insert "\n\n" (emacs-version)
962 " 962 "
963Copyright (C) 1999 Free Software Foundation, Inc.") 963Copyright (C) 2000 Free Software Foundation, Inc.")
964 (if (and (eq (key-binding "\C-h\C-c") 'describe-copying) 964 (if (and (eq (key-binding "\C-h\C-c") 'describe-copying)
965 (eq (key-binding "\C-h\C-d") 'describe-distribution) 965 (eq (key-binding "\C-h\C-d") 'describe-distribution)
966 (eq (key-binding "\C-h\C-w") 'describe-no-warranty)) 966 (eq (key-binding "\C-h\C-w") 'describe-no-warranty))