[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Emacs-diffs] Changes to emacs/lisp/startup.el,v
From: |
Juri Linkov |
Subject: |
[Emacs-diffs] Changes to emacs/lisp/startup.el,v |
Date: |
Thu, 28 Feb 2008 22:50:12 +0000 |
CVSROOT: /sources/emacs
Module name: emacs
Changes by: Juri Linkov <jurta> 08/02/28 22:50:12
Index: startup.el
===================================================================
RCS file: /sources/emacs/emacs/lisp/startup.el,v
retrieving revision 1.480
retrieving revision 1.481
diff -u -b -r1.480 -r1.481
--- startup.el 17 Feb 2008 16:57:41 -0000 1.480
+++ startup.el 28 Feb 2008 22:50:12 -0000 1.481
@@ -56,7 +56,6 @@
(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."
@@ -1155,9 +1154,7 @@
")
"Initial message displayed in *scratch* buffer at startup.
-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."
+If this is nil, no message will be displayed."
:type '(choice (text :tag "Message")
(const :tag "none" nil))
:group 'initialization)
@@ -2185,6 +2182,14 @@
((stringp initial-buffer-choice)
(find-file initial-buffer-choice))))
+ ;; 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
initial-buffer-choice
noninteractive
@@ -2230,14 +2235,6 @@
;; (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, Miles Bader, 2008/02/01
- [Emacs-diffs] Changes to emacs/lisp/startup.el,v, Jan Djärv, 2008/02/07
- [Emacs-diffs] Changes to emacs/lisp/startup.el,v, Glenn Morris, 2008/02/10
- [Emacs-diffs] Changes to emacs/lisp/startup.el,v, Juri Linkov, 2008/02/12
- [Emacs-diffs] Changes to emacs/lisp/startup.el,v, Glenn Morris, 2008/02/16
- [Emacs-diffs] Changes to emacs/lisp/startup.el,v, Juri Linkov, 2008/02/16
- [Emacs-diffs] Changes to emacs/lisp/startup.el,v, Dan Nicolaescu, 2008/02/17
- [Emacs-diffs] Changes to emacs/lisp/startup.el,v,
Juri Linkov <=
- [Emacs-diffs] Changes to emacs/lisp/startup.el,v, Juri Linkov, 2008/02/28
- [Emacs-diffs] Changes to emacs/lisp/startup.el,v, Juri Linkov, 2008/02/28
- [Emacs-diffs] Changes to emacs/lisp/startup.el,v, Kim F. Storm, 2008/02/29