comparison lisp/startup.el @ 80263:5a10ddb5551f

Revert 2008-02-28 change that adds initial message to *scratch* buffer regardless of the value of `inhibit-startup-screen'.

80262:22717831546c

  "Emacs start-up procedure."
  :group 'environment)

(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)



	    ;; to command-line options can cause the last visible frame
	    ;; to be deleted.  In this case, kill emacs to avoid an
	    ;; 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)

	;; Not displaying a startup screen.  If 3 or more files

      ;; ;; clicks the menu bar during the sit-for.
      ;; (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)))))

80263:5a10ddb5551f

  "Emacs start-up procedure."
  :group 'environment)

(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)



	    ;; to command-line options can cause the last visible frame
	    ;; to be deleted.  In this case, kill emacs to avoid an
	    ;; abort later.
	    (unless (frame-live-p (selected-frame)) (kill-emacs nil))))))

    (if (or inhibit-startup-screen
	    noninteractive
	    emacs-quick-startup)

	;; Not displaying a startup screen.  If 3 or more files

      ;; ;; clicks the menu bar during the sit-for.
      ;; (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)))))