[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Emacs-diffs] Changes to emacs/lisp/startup.el,v [EMACS_22_BASE]
From: |
Juri Linkov |
Subject: |
[Emacs-diffs] Changes to emacs/lisp/startup.el,v [EMACS_22_BASE] |
Date: |
Sun, 02 Mar 2008 16:17:58 +0000 |
CVSROOT: /sources/emacs
Module name: emacs
Branch: EMACS_22_BASE
Changes by: Juri Linkov <jurta> 08/03/02 16:17:58
Index: startup.el
===================================================================
RCS file: /sources/emacs/emacs/lisp/startup.el,v
retrieving revision 1.436.2.14
retrieving revision 1.436.2.15
diff -u -b -r1.436.2.14 -r1.436.2.15
--- startup.el 28 Feb 2008 23:29:44 -0000 1.436.2.14
+++ startup.el 2 Mar 2008 16:17:57 -0000 1.436.2.15
@@ -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 @@
")
"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 @@
;; 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 @@
;; (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)))))
- [Emacs-diffs] Changes to emacs/lisp/startup.el,v [EMACS_22_BASE],
Juri Linkov <=