* lisp/startup.el (command-line-1): Inhibit splash from daemon.

Fixes: debbugs:10996

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 5b2ede2..fdd3919 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,7 @@
+2012-04-10  Stefan Monnier  <monnier@iro.umontreal.ca>
+
+       * startup.el (command-line-1): Inhibit splash from daemon (bug#10996).
+
 2012-04-10  Andreas Schwab  <schwab@linux-m68k.org>
 
        * international/characters.el: Fix sorting.

diff --git a/lisp/startup.el b/lisp/startup.el
index 37e4f55..2f72e80 100644 (file)
--- a/lisp/startup.el
+++ b/lisp/startup.el
@@ -2341,6 +2341,7 @@ A fancy display is used on graphic displays, normal otherwise."
     (if (or inhibit-startup-screen
            initial-buffer-choice
            noninteractive
+            (daemonp)
            inhibit-x-resources)
 
        ;; Not displaying a startup screen.  If 3 or more files
@@ -2383,9 +2384,7 @@ A fancy display is used on graphic displays, normal otherwise."
       ;; (with-no-warnings
       ;;       (setq menubar-bindings-done t))
 
-      (if (> file-count 0)
-         (display-startup-screen t)
-       (display-startup-screen nil)))))
+      (display-startup-screen (> file-count 0)))))
 
 (defun command-line-normalize-file-name (file)
   "Collapse multiple slashes to one, to handle non-Emacs file names."