From: Richard M. Stallman <rms@gnu.org>
Date: Sat, 20 Aug 2005 21:48:20 +0000 (+0000)
Subject: (command-line-1): Don't suppress startup screen due to existing processes.
X-Git-Tag: emacs-pretest-22.0.90~7507
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=3c24b4e4a5f36bf7c57d495332a73b7d00127bc6;p=emacs.git

(command-line-1): Don't suppress startup screen due to existing processes.
---

diff --git a/lisp/startup.el b/lisp/startup.el
index 8dac582e452..32021225e7e 100644
--- a/lisp/startup.el
+++ b/lisp/startup.el
@@ -1724,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