diff options
| author | Richard M. Stallman | 2005-08-20 21:48:20 +0000 |
|---|---|---|
| committer | Richard M. Stallman | 2005-08-20 21:48:20 +0000 |
| commit | 3c24b4e4a5f36bf7c57d495332a73b7d00127bc6 (patch) | |
| tree | 534e285b579309010dd4f8a6bce5581db81055a7 | |
| parent | 32993501da2a61b739c6c65fb42f16e3d3554272 (diff) | |
| download | emacs-3c24b4e4a5f36bf7c57d495332a73b7d00127bc6.tar.gz emacs-3c24b4e4a5f36bf7c57d495332a73b7d00127bc6.zip | |
(command-line-1): Don't suppress startup screen due to existing processes.
| -rw-r--r-- | lisp/startup.el | 6 |
1 files changed, 1 insertions, 5 deletions
diff --git a/lisp/startup.el b/lisp/startup.el index 8dac582e452..32021225e7e 100644 --- a/lisp/startup.el +++ b/lisp/startup.el | |||
| @@ -1724,11 +1724,7 @@ normal otherwise." | |||
| 1724 | ;; Maybe display a startup screen. | 1724 | ;; Maybe display a startup screen. |
| 1725 | (unless (or inhibit-startup-message | 1725 | (unless (or inhibit-startup-message |
| 1726 | noninteractive | 1726 | noninteractive |
| 1727 | emacs-quick-startup | 1727 | emacs-quick-startup) |
| 1728 | ;; Don't display startup screen if init file | ||
| 1729 | ;; has started some sort of server. | ||
| 1730 | (and (fboundp 'process-list) | ||
| 1731 | (process-list))) | ||
| 1732 | ;; Display a startup screen, after some preparations. | 1728 | ;; Display a startup screen, after some preparations. |
| 1733 | 1729 | ||
| 1734 | ;; If there are no switches to process, we might as well | 1730 | ;; If there are no switches to process, we might as well |