[Emacs-diffs] /srv/bzr/emacs/emacs-24 r107806: * lisp/startup.el (command-line-1): Inhibit splash from daemon.

[Stefan Monnier]

------------------------------------------------------------
revno: 107806
fixes bug(s): http://debbugs.gnu.org/cgi/bugreport.cgi?bug=10996
committer: Stefan Monnier <address@hidden>
branch nick: emacs-24
timestamp: Tue 2012-04-10 13:53:31 -0400
message:
  * lisp/startup.el (command-line-1): Inhibit splash from daemon.
modified:
  lisp/ChangeLog
  lisp/startup.el

=== modified file 'lisp/ChangeLog'
--- a/lisp/ChangeLog    2012-04-10 12:21:28 +0000
+++ b/lisp/ChangeLog    2012-04-10 17:53:31 +0000
@@ -1,3 +1,7 @@
+2012-04-10  Stefan Monnier  <address@hidden>
+
+       * startup.el (command-line-1): Inhibit splash from daemon (bug#10996).
+
 2012-04-10  Andreas Schwab  <address@hidden>
 
        * international/characters.el: Fix sorting.

=== modified file 'lisp/startup.el'
--- a/lisp/startup.el   2012-03-27 06:45:12 +0000
+++ b/lisp/startup.el   2012-04-10 17:53:31 +0000
@@ -2341,6 +2341,7 @@
     (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 @@
       ;; (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."