comparison lisp/startup.el @ 92786:f85ca7d27ab2

(inhibit-startup-screen): Revert incomplete 2008-03-10 merge from emacs--rel--22 that partly reverted 2008-02-28 change that added initial message to *scratch* buffer regardless of the value of `inhibit-startup-screen'. Now keep this change in the trunk, but not in the 22 branch.

92785:ca94bdbd0b62

  :version "23.1"
  :group 'initialization)

(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."
  :type 'boolean
  :group 'initialization)

;; If you want to create a file, visit that file with C-x C-f,
;; then enter the text in that file's own buffer.

")
  "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."
  :type '(choice (text :tag "Message")
		 (const :tag "none" nil))
  :group 'initialization)



      ;; (when (display-popup-menus-p)
      ;; 	(precompute-menubar-bindings))
      ;; (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)))))

(defun command-line-normalize-file-name (file)

92786:f85ca7d27ab2

  :version "23.1"
  :group 'initialization)

(defcustom inhibit-startup-screen nil
  "Non-nil inhibits the startup screen.

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."
  :type 'boolean
  :group 'initialization)

;; If you want to create a file, visit that file with C-x C-f,
;; then enter the text in that file's own buffer.

")
  "Initial message displayed in *scratch* buffer at startup.
If this is nil, no message will be displayed."
  :type '(choice (text :tag "Message")
		 (const :tag "none" nil))
  :group 'initialization)



      ;; (when (display-popup-menus-p)
      ;; 	(precompute-menubar-bindings))
      ;; (with-no-warnings
      ;; 	(setq menubar-bindings-done t))

      (if (> file-count 0)
	  (display-startup-screen t)
	(display-startup-screen nil)))))

(defun command-line-normalize-file-name (file)