aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRichard M. Stallman2002-09-09 19:34:13 +0000
committerRichard M. Stallman2002-09-09 19:34:13 +0000
commit9d5cf87c08343635aeff43fd93c65c7e11426312 (patch)
tree92428e3a121e35ce137a02c7675bb4492b460b57
parentb921b596bc291fbb449c010c46df88eb05f436c4 (diff)
downloademacs-9d5cf87c08343635aeff43fd93c65c7e11426312.tar.gz
emacs-9d5cf87c08343635aeff43fd93c65c7e11426312.zip
(fancy-splash-head, normal-splash-screen):
Change the messages that explain about GNU or GNU/Linux.
-rw-r--r--lisp/startup.el17
1 files changed, 8 insertions, 9 deletions
diff --git a/lisp/startup.el b/lisp/startup.el
index bff7e09e4fe..456eae5788c 100644
--- a/lisp/startup.el
+++ b/lisp/startup.el
@@ -1197,12 +1197,10 @@ where FACE is a valid face specification, as it can be used with
1197 (insert-image img (propertize "xxx" 'help-echo help-echo 1197 (insert-image img (propertize "xxx" 'help-echo help-echo
1198 'keymap map))) 1198 'keymap map)))
1199 (insert "\n")))) 1199 (insert "\n"))))
1200 (if (eq system-type 'gnu/linux) 1200 (fancy-splash-insert
1201 (fancy-splash-insert 1201 :face '(variable-pitch :foreground "red")
1202 :face '(variable-pitch :foreground "red") 1202 (if (eq system-type 'gnu/linux)
1203 "GNU Emacs is one component of a Linux-based GNU system.") 1203 "GNU Emacs is one component of the GNU/Linux operating system."
1204 (fancy-splash-insert
1205 :face '(variable-pitch :foreground "red")
1206 "GNU Emacs is one component of the GNU operating system.")) 1204 "GNU Emacs is one component of the GNU operating system."))
1207 (insert "\n") 1205 (insert "\n")
1208 (unless (equal (buffer-name fancy-splash-outer-buffer) "*scratch*") 1206 (unless (equal (buffer-name fancy-splash-outer-buffer) "*scratch*")
@@ -1346,9 +1344,10 @@ we put it on this frame."
1346 ;; each piece of output starts with one or two newlines 1344 ;; each piece of output starts with one or two newlines
1347 ;; and does not end with any newlines. 1345 ;; and does not end with any newlines.
1348 (insert "Welcome to GNU Emacs") 1346 (insert "Welcome to GNU Emacs")
1349 (if (eq system-type 'gnu/linux) 1347 (insert
1350 (insert ", one component of a Linux-based GNU system.")) 1348 (if (eq system-type 'gnu/linux)
1351 (insert "\n") 1349 ", one component of the GNU/Linux operating system.\n"
1350 ", a part of the GNU operating system.\n"))
1352 1351
1353 (unless (equal (buffer-name prev-buffer) "*scratch*") 1352 (unless (equal (buffer-name prev-buffer) "*scratch*")
1354 (insert (substitute-command-keys 1353 (insert (substitute-command-keys