From 1344a1f99e110e040d69325f27a6d2afd26a7535 Mon Sep 17 00:00:00 2001 From: Juri Linkov Date: Sun, 2 Mar 2008 16:18:21 +0000 Subject: Revert 2008-02-28 change that adds initial message to *scratch* buffer regardless of the value of `inhibit-startup-screen'. --- lisp/startup.el | 21 ++++++++++++--------- 1 file changed, 12 insertions(+), 9 deletions(-) (limited to 'lisp/startup.el') diff --git a/lisp/startup.el b/lisp/startup.el index a5e315cbc0f..4f66a1cf501 100644 --- a/lisp/startup.el +++ b/lisp/startup.el @@ -42,6 +42,7 @@ (defcustom inhibit-startup-screen nil "Non-nil inhibits the startup screen. +It also inhibits display of the initial message in the `*scratch*' buffer. This is for use in your personal init file (but NOT site-start.el), once you are familiar with the contents of the startup screen." @@ -1122,7 +1123,9 @@ or `CVS', and any subdirectory that contains a file named `.nosearch'." ") "Initial message displayed in *scratch* buffer at startup. -If this is nil, no message will be displayed." +If this is nil, no message will be displayed. +If `inhibit-startup-screen' is non-nil, then no message is displayed, +regardless of the value of this variable." :type '(choice (text :tag "Message") (const :tag "none" nil)) :group 'initialization) @@ -2121,14 +2124,6 @@ A fancy display is used on graphic displays, normal otherwise." ;; abort later. (unless (frame-live-p (selected-frame)) (kill-emacs nil)))))) - ;; If *scratch* exists and is empty, insert initial-scratch-message. - (and initial-scratch-message - (get-buffer "*scratch*") - (with-current-buffer "*scratch*" - (when (zerop (buffer-size)) - (insert initial-scratch-message) - (set-buffer-modified-p nil)))) - (if (or inhibit-startup-screen noninteractive emacs-quick-startup) @@ -2173,6 +2168,14 @@ A fancy display is used on graphic displays, normal otherwise." ;; (with-no-warnings ;; (setq menubar-bindings-done t)) + ;; If *scratch* exists and is empty, insert initial-scratch-message. + (and initial-scratch-message + (get-buffer "*scratch*") + (with-current-buffer "*scratch*" + (when (zerop (buffer-size)) + (insert initial-scratch-message) + (set-buffer-modified-p nil)))) + (if (> file-count 0) (display-startup-screen t) (display-startup-screen nil))))) -- cgit v1.2.3 From 015b0d507d052f715d4dbf8df7c63c624372b427 Mon Sep 17 00:00:00 2001 From: "Kim F. Storm" Date: Thu, 6 Mar 2008 00:08:01 +0000 Subject: (describe-gnu-project): Rename from describe-project. Change users. --- lisp/menu-bar.el | 2 +- lisp/startup.el | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) (limited to 'lisp/startup.el') diff --git a/lisp/menu-bar.el b/lisp/menu-bar.el index 4280dad5962..38479b676ab 100644 --- a/lisp/menu-bar.el +++ b/lisp/menu-bar.el @@ -1341,7 +1341,7 @@ key, a click, or a menu-item")) :help "Read the Introduction to Emacs Lisp Programming")) (define-key menu-bar-help-menu [about-gnu-project] - '(menu-item "About GNU" describe-project + '(menu-item "About GNU" describe-gnu-project :help "About the GNU System, GNU Project, and GNU/Linux")) (define-key menu-bar-help-menu [about-emacs] '(menu-item "About Emacs" about-emacs diff --git a/lisp/startup.el b/lisp/startup.el index 4f66a1cf501..55f5e98c06c 100644 --- a/lisp/startup.el +++ b/lisp/startup.el @@ -1148,7 +1148,7 @@ regardless of the value of this variable." '("GNU/Linux" (lambda (button) (browse-url "http://www.gnu.org/gnu/linux-and-gnu.html")) "Browse http://www.gnu.org/gnu/linux-and-gnu.html") - '("GNU" (lambda (button) (describe-project)) + '("GNU" (lambda (button) (describe-gnu-project)) "Display info on the GNU project"))) " operating system.\n" :face variable-pitch "To quit a partially entered command, type " @@ -1207,7 +1207,7 @@ Each element in the list should be a list of strings or pairs '("GNU/Linux" (lambda (button) (browse-url "http://www.gnu.org/gnu/linux-and-gnu.html")) "Browse http://www.gnu.org/gnu/linux-and-gnu.html") - '("GNU" (lambda (button) (describe-project)) + '("GNU" (lambda (button) (describe-gnu-project)) "Display info on the GNU project."))) " operating system.\n" :face (lambda () @@ -1222,7 +1222,7 @@ Each element in the list should be a list of strings or pairs (lambda () emacs-copyright) "\n\n" :face variable-pitch - :link ("GNU and Freedom" (lambda (button) (describe-project))) + :link ("GNU and Freedom" (lambda (button) (describe-gnu-project))) "\tWhy we developed GNU Emacs, and the GNU operating system\n" :link ("Absence of Warranty" (lambda (button) (describe-no-warranty))) "\tGNU Emacs comes with " @@ -1816,7 +1816,7 @@ Type \\[describe-distribution] for information on ")) (insert "To follow a link, click Mouse-1 on it, or move to it and type RET.\n\n") (insert-button "GNU and Freedom" - 'action (lambda (button) (describe-project)) + 'action (lambda (button) (describe-gnu-project)) 'follow-link t) (insert "\t\tWhy we developed GNU Emacs and the GNU system\n") -- cgit v1.2.3