aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorGerd Moellmann2000-12-06 16:01:31 +0000
committerGerd Moellmann2000-12-06 16:01:31 +0000
commit347d0813d20dd091e3a1fc049baa6b499619c262 (patch)
tree5165eff3457961641ba0cf3b517a806b41984ac8
parent4ee87dbb3d032ae7e5fe51b14798e1b7fe377554 (diff)
downloademacs-347d0813d20dd091e3a1fc049baa6b499619c262.tar.gz
emacs-347d0813d20dd091e3a1fc049baa6b499619c262.zip
(fancy-splash-text, command-line-1): Use
`File' for the menu name instead of `Files'.
-rw-r--r--lisp/ChangeLog3
-rw-r--r--lisp/startup.el7
2 files changed, 7 insertions, 3 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 239937adb67..3cee6c6ee49 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -15,6 +15,9 @@
15 15
162000-12-06 Gerd Moellmann <gerd@gnu.org> 162000-12-06 Gerd Moellmann <gerd@gnu.org>
17 17
18 * startup.el (fancy-splash-text, command-line-1): Use
19 `File' for the menu name instead of `Files'.
20
18 * tmm.el: Update copyright. 21 * tmm.el: Update copyright.
19 22
20 * cus-start.el: Add entry for even-window-heights. 23 * cus-start.el: Add entry for even-window-heights.
diff --git a/lisp/startup.el b/lisp/startup.el
index 40e0a5f02c3..c63c0b15d1a 100644
--- a/lisp/startup.el
+++ b/lisp/startup.el
@@ -1,6 +1,7 @@
1;;; startup.el --- process Emacs shell arguments 1;;; startup.el --- process Emacs shell arguments
2 2
3;; Copyright (C) 1985, 86, 92, 94, 95, 96, 97, 98, 99, 2000 Free Software Foundation, Inc. 3;; Copyright (C) 1985, 86, 92, 94, 95, 96, 97, 98, 99, 2000
4;; Free Software Foundation, Inc.
4 5
5;; Maintainer: FSF 6;; Maintainer: FSF
6;; Keywords: internal 7;; Keywords: internal
@@ -965,7 +966,7 @@ If this is nil, no message will be displayed."
965 "You can do basic editing with the menu bar and scroll bar \ 966 "You can do basic editing with the menu bar and scroll bar \
966using the mouse.\n\n" 967using the mouse.\n\n"
967 :face (variable-pitch :weight bold) 968 :face (variable-pitch :weight bold)
968 "Useful Files menu items:\n" 969 "Useful File menu items:\n"
969 :face variable-pitch "\ 970 :face variable-pitch "\
970Exit Emacs\t(or type Control-x followed by Control-c) 971Exit Emacs\t(or type Control-x followed by Control-c)
971Recover Session\trecover files you were editing before a crash 972Recover Session\trecover files you were editing before a crash
@@ -1263,7 +1264,7 @@ where FACE is a valid face specification, as it can be used with
1263 (insert "\ 1264 (insert "\
1264You can do basic editing with the menu bar and scroll bar using the mouse. 1265You can do basic editing with the menu bar and scroll bar using the mouse.
1265 1266
1266Useful Files menu items: 1267Useful File menu items:
1267Exit Emacs (or type Control-x followed by Control-c) 1268Exit Emacs (or type Control-x followed by Control-c)
1268Recover Session recover files you were editing before a crash 1269Recover Session recover files you were editing before a crash
1269 1270