comparison lisp/startup.el @ 41496:9c8e073f49db

(command-line-1): Don't do startup screen if a subprocess is running. Call the startup screen buffer "GNU Emacs". Make a special mode-line-format for it.

41495:0bac781ea0d6

    (when (and (not inhibit-startup-message) (not noninteractive)
	       ;; Don't display startup screen if init file
	       ;; has selected another buffer.
	       (string= (buffer-name) "*scratch*")
	       ;; Don't display startup screen if init file
	       ;; has inserted some text in *scratch*.
	       (= 0 (buffer-size)))
      ;; Display a startup screen, after some preparations.

      ;; If there are no switches to process, we might as well

      (set-buffer-modified-p nil)

      ;; If user typed input during all that work,
      ;; abort the startup screen.  Otherwise, display it now.
      (when (not (input-pending-p))
	(with-temp-buffer
	  (if (and (display-graphic-p)
		   (use-fancy-splash-screens-p))
	      (fancy-splash-screens)
	    (let ((tab-width 8))
	      ;; The convention for this piece of code is that
	      ;; each piece of output starts with one or two newlines
	      ;; and does not end with any newlines.
	      (insert "Welcome to GNU Emacs")
	      (if (eq system-type 'gnu/linux)

	      ;; Display the input that we set up in the buffer.
	      (set-buffer-modified-p nil)
	      (goto-char (point-min))
	      (save-window-excursion
		(switch-to-buffer (current-buffer))
		(sit-for 120)))))))))


(defun command-line-normalize-file-name (file)
  "Collapse multiple slashes to one, to handle non-Emacs file names."
  (save-match-data

41496:9c8e073f49db

    (when (and (not inhibit-startup-message) (not noninteractive)
	       ;; Don't display startup screen if init file
	       ;; has selected another buffer.
	       (string= (buffer-name) "*scratch*")
	       ;; Don't display startup screen if init file
	       ;; has started some sort of server.
	       (process-list)
	       ;; Don't display startup screen if init file
	       ;; has inserted some text in *scratch*.
	       (= 0 (buffer-size)))
      ;; Display a startup screen, after some preparations.

      ;; If there are no switches to process, we might as well

      (set-buffer-modified-p nil)

      ;; If user typed input during all that work,
      ;; abort the startup screen.  Otherwise, display it now.
      (when (not (input-pending-p))
	(with-current-buffer (get-buffer-create "GNU Emacs")
	  (if (and (display-graphic-p)
		   (use-fancy-splash-screens-p))
	      (fancy-splash-screens)
	    (let ((tab-width 8)
		  (mode-line-format (propertize "---- %b %-" 
						'face '(:weight bold))))

	      ;; The convention for this piece of code is that
	      ;; each piece of output starts with one or two newlines
	      ;; and does not end with any newlines.
	      (insert "Welcome to GNU Emacs")
	      (if (eq system-type 'gnu/linux)

	      ;; Display the input that we set up in the buffer.
	      (set-buffer-modified-p nil)
	      (goto-char (point-min))
	      (save-window-excursion
		(switch-to-buffer (current-buffer))
		(sit-for 120)))))
	(kill-buffer "GNU Emacs")))))


(defun command-line-normalize-file-name (file)
  "Collapse multiple slashes to one, to handle non-Emacs file names."
  (save-match-data