aboutsummaryrefslogtreecommitdiffstats
path: root/lisp
diff options
context:
space:
mode:
Diffstat (limited to 'lisp')
-rw-r--r--lisp/ChangeLog6
-rw-r--r--lisp/startup.el13
2 files changed, 13 insertions, 6 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 63aafa458b3..34529945615 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,9 @@
12000-11-03 Gerd Moellmann <gerd@gnu.org>
2
3 * startup.el (fancy-splash-text, fancy-splash-text): Use a single
4 tab character.
5 (fancy-splash-screens): Set tab-width to 20.
6
12000-11-03 Dave Love <fx@gnu.org> 72000-11-03 Dave Love <fx@gnu.org>
2 8
3 * comint.el (comint-completion-addsuffix): Fix custom type. 9 * comint.el (comint-completion-addsuffix): Fix custom type.
diff --git a/lisp/startup.el b/lisp/startup.el
index 0a0919958f3..40075d82bfe 100644
--- a/lisp/startup.el
+++ b/lisp/startup.el
@@ -954,8 +954,8 @@ using the mouse.\n\n"
954 :face (variable-pitch :weight bold) 954 :face (variable-pitch :weight bold)
955 "Useful Files menu items:\n" 955 "Useful Files menu items:\n"
956 :face variable-pitch "\ 956 :face variable-pitch "\
957Exit Emacs (or type Control-x followed by Control-c) 957Exit Emacs\t(or type Control-x followed by Control-c)
958Recover Session recover files you were editing before a crash 958Recover Session\trecover files you were editing before a crash
959 959
960 960
961" 961"
@@ -966,14 +966,14 @@ using the mouse.\n\n"
966 :face (variable-pitch :weight bold) 966 :face (variable-pitch :weight bold)
967 "Important Help menu items:\n" 967 "Important Help menu items:\n"
968 :face variable-pitch "\ 968 :face variable-pitch "\
969Emacs Tutorial Learn-by-doing tutorial for using Emacs efficiently. 969Emacs Tutorial\tLearn-by-doing tutorial for using Emacs efficiently.
970Emacs FAQ Frequently asked questions and answers 970Emacs FAQ\tFrequently asked questions and answers
971\(Non)Warranty GNU Emacs comes with " 971\(Non)Warranty\tGNU Emacs comes with "
972 :face (variable-pitch :slant oblique) 972 :face (variable-pitch :slant oblique)
973 "ABSOLUTELY NO WARRANTY\n" 973 "ABSOLUTELY NO WARRANTY\n"
974 :face variable-pitch 974 :face variable-pitch
975 "\ 975 "\
976Copying Conditions Conditions for redistributing and changing Emacs\n")) 976Copying Conditions\tConditions for redistributing and changing Emacs\n"))
977 "A list of texts to show in the middle part of splash screens. 977 "A list of texts to show in the middle part of splash screens.
978Each element in the list should be a list of strings or pairs 978Each element in the list should be a list of strings or pairs
979`:face FACE', like `fancy-splash-insert' accepts them.") 979`:face FACE', like `fancy-splash-insert' accepts them.")
@@ -1103,6 +1103,7 @@ where FACE is a valid face specification, as it can be used with
1103 "Display fancy splash screens when Emacs starts." 1103 "Display fancy splash screens when Emacs starts."
1104 (setq fancy-splash-help-echo (startup-echo-area-message)) 1104 (setq fancy-splash-help-echo (startup-echo-area-message))
1105 (switch-to-buffer "GNU Emacs") 1105 (switch-to-buffer "GNU Emacs")
1106 (setq tab-width 20)
1106 (let ((old-busy-cursor display-busy-cursor) 1107 (let ((old-busy-cursor display-busy-cursor)
1107 (splash-buffer (current-buffer)) 1108 (splash-buffer (current-buffer))
1108 timer) 1109 timer)