Commit ede141ac authored by Stefan Monnier's avatar Stefan Monnier

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

Fixes: debbugs:10996
parent d0203d61
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.
......
......@@ -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."
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment