diff options
| author | Stefan Monnier <monnier@iro.umontreal.ca> | 2012-04-10 13:53:31 -0400 |
|---|---|---|
| committer | Stefan Monnier <monnier@iro.umontreal.ca> | 2012-04-10 13:53:31 -0400 |
| commit | ede141ac13b356380e03c510da185c2bd781bd4c (patch) | |
| tree | 1f8660230b4c0bf2e9897e3bd30d5127d9a3d925 | |
| parent | d0203d61449b1e907a0b5d0b2d4bb9d989145cc1 (diff) | |
| download | emacs-ede141ac13b356380e03c510da185c2bd781bd4c.tar.gz | |
* lisp/startup.el (command-line-1): Inhibit splash from daemon.
Fixes: debbugs:10996
| -rw-r--r-- | lisp/ChangeLog | 4 | ||||
| -rw-r--r-- | lisp/startup.el | 5 |
2 files changed, 6 insertions, 3 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog index 5b2ede24777..fdd3919b13b 100644 --- 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 37e4f550dcd..2f72e804892 100644 --- 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." |