X-Git-Url: https://code.delx.au/gnu-emacs/blobdiff_plain/0f0cef08e6f9fc6cf771bea57cf8edd3c3dfc44d..dfc9a078920aaa69c75b712a9199f38db6c13de4:/lisp/startup.el

diff --git a/lisp/startup.el b/lisp/startup.el
index ca71ef4313..32021225e7 100644
--- a/lisp/startup.el
+++ b/lisp/startup.el
@@ -1635,6 +1635,8 @@ normal otherwise."
                      (setq file file-ex))
                    (load file nil t)))
 
+		;; This is used to handle -script.  It's not clear
+		;; we need to document it.
                 ((member argi '("-scriptload"))
                  (let* ((file (command-line-normalize-file-name
                                (or argval (pop command-line-args-left))))
@@ -1722,11 +1724,7 @@ normal otherwise."
   ;; Maybe display a startup screen.
   (unless (or inhibit-startup-message
 	      noninteractive
-	      emacs-quick-startup
-	     ;; Don't display startup screen if init file
-	     ;; has started some sort of server.
-	     (and (fboundp 'process-list)
-		  (process-list)))
+	      emacs-quick-startup)
     ;; Display a startup screen, after some preparations.
 
     ;; If there are no switches to process, we might as well