diff options
| author | Glenn Morris <rgm@gnu.org> | 2012-04-13 18:46:06 -0700 |
|---|---|---|
| committer | Glenn Morris <rgm@gnu.org> | 2012-04-13 18:46:06 -0700 |
| commit | 35dc09a19c606f9e7a078df32d030451c7c90ba1 (patch) | |
| tree | 8df2ade99ad8620568094d61bba9dd4ac8856c43 /lisp/startup.el | |
| parent | 327732d994c98849c765659aa2164a7482b6beab (diff) | |
| parent | ad3a2b411dc2b34f5d6fa434aee3ca56fa7a88e7 (diff) | |
| download | emacs-35dc09a19c606f9e7a078df32d030451c7c90ba1.tar.gz | |
Merge from emacs-24, up to 2012-04-10T02:06:19Z!larsi@gnus.org
Diffstat (limited to 'lisp/startup.el')
| -rw-r--r-- | lisp/startup.el | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/lisp/startup.el b/lisp/startup.el index b5dae92517a..4a8af55af2f 100644 --- a/lisp/startup.el +++ b/lisp/startup.el @@ -2316,6 +2316,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 @@ -2358,9 +2359,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." |