aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJuri Linkov2008-07-19 23:55:02 +0000
committerJuri Linkov2008-07-19 23:55:02 +0000
commitbb398779088b13bc7ede1589709d6adc3b0e7991 (patch)
treecc87e74190c9b968fa12780ebbcddc5a9e6bf9e0
parent15f5445063e27e13e52ce21962318343b62b9f38 (diff)
downloademacs-bb398779088b13bc7ede1589709d6adc3b0e7991.tar.gz
emacs-bb398779088b13bc7ede1589709d6adc3b0e7991.zip
(fancy-startup-text): Move the line "To quit a partially entered command,
type Control-g" a few lines below to be after the line "To start". Add text "at gnu.org" to "Overview of Emacs features".
-rw-r--r--lisp/startup.el11
1 files changed, 6 insertions, 5 deletions
diff --git a/lisp/startup.el b/lisp/startup.el
index d3ab1d502a9..6fdab938cf9 100644
--- a/lisp/startup.el
+++ b/lisp/startup.el
@@ -1249,10 +1249,7 @@ If this is nil, no message will be displayed."
1249 "Browse http://www.gnu.org/gnu/linux-and-gnu.html") 1249 "Browse http://www.gnu.org/gnu/linux-and-gnu.html")
1250 '("GNU" (lambda (button) (describe-gnu-project)) 1250 '("GNU" (lambda (button) (describe-gnu-project))
1251 "Display info on the GNU project"))) 1251 "Display info on the GNU project")))
1252 " operating system.\n" 1252 " operating system.\n\n"
1253 :face variable-pitch "To quit a partially entered command, type "
1254 :face default "Control-g"
1255 :face variable-pitch ".\n\n"
1256 :link ("Emacs Tutorial" (lambda (button) (help-with-tutorial))) 1253 :link ("Emacs Tutorial" (lambda (button) (help-with-tutorial)))
1257 "\tLearn basic keystroke commands" 1254 "\tLearn basic keystroke commands"
1258 (lambda () 1255 (lambda ()
@@ -1276,7 +1273,7 @@ If this is nil, no message will be displayed."
1276 :link ("Emacs Guided Tour" 1273 :link ("Emacs Guided Tour"
1277 (lambda (button) (browse-url "http://www.gnu.org/software/emacs/tour/")) 1274 (lambda (button) (browse-url "http://www.gnu.org/software/emacs/tour/"))
1278 "Browse http://www.gnu.org/software/emacs/tour/") 1275 "Browse http://www.gnu.org/software/emacs/tour/")
1279 "\tOverview of Emacs features\n" 1276 "\tOverview of Emacs features at gnu.org\n"
1280 :link ("View Emacs Manual" (lambda (button) (info-emacs-manual))) 1277 :link ("View Emacs Manual" (lambda (button) (info-emacs-manual)))
1281 "\tView the Emacs manual using Info\n" 1278 "\tView the Emacs manual using Info\n"
1282 :link ("Absence of Warranty" (lambda (button) (describe-no-warranty))) 1279 :link ("Absence of Warranty" (lambda (button) (describe-no-warranty)))
@@ -1497,6 +1494,10 @@ a face or button specification."
1497 (lambda (button) (customize-group 'initialization)) 1494 (lambda (button) (customize-group 'initialization))
1498 "Change initialization settings including this screen") 1495 "Change initialization settings including this screen")
1499 "\n")) 1496 "\n"))
1497 (fancy-splash-insert
1498 :face 'variable-pitch "To quit a partially entered command, type "
1499 :face 'default "Control-g"
1500 :face 'variable-pitch ".\n")
1500 (fancy-splash-insert :face `(variable-pitch (:foreground ,fg)) 1501 (fancy-splash-insert :face `(variable-pitch (:foreground ,fg))
1501 "\nThis is " 1502 "\nThis is "
1502 (emacs-version) 1503 (emacs-version)