diff options
| author | Eli Zaretskii <eliz@gnu.org> | 2001-11-26 19:41:57 +0000 |
|---|---|---|
| committer | Eli Zaretskii <eliz@gnu.org> | 2001-11-26 19:41:57 +0000 |
| commit | 26780e5b6be7b5bbdf56bb299fea43a3820ddc6d (patch) | |
| tree | 285a39f32562a9ccd814b0a25eec745db91d42a8 /lisp | |
| parent | bc5c763a1bc97032789b192f8496388418a06f5b (diff) | |
| download | emacs-26780e5b6be7b5bbdf56bb299fea43a3820ddc6d.tar.gz emacs-26780e5b6be7b5bbdf56bb299fea43a3820ddc6d.tar.bz2 emacs-26780e5b6be7b5bbdf56bb299fea43a3820ddc6d.zip | |
(command-line-1): Don't try to call process-list if it is not fboundp.
Diffstat (limited to 'lisp')
| -rw-r--r-- | lisp/ChangeLog | 5 | ||||
| -rw-r--r-- | lisp/startup.el | 5 |
2 files changed, 8 insertions, 2 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog index 85dcbb35d32..e650ba78b68 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog @@ -1,3 +1,8 @@ +2001-11-26 Eli Zaretskii <eliz@is.elta.co.il> + + * startup.el (command-line-1): Don't try to call process-list if + it is not fboundp. + 2001-11-26 Sam Steingold <sds@gnu.org> * frame.el (show-trailing-whitespace): Remove :set argument (the diff --git a/lisp/startup.el b/lisp/startup.el index ce5ebb6faa6..df8075a7def 100644 --- a/lisp/startup.el +++ b/lisp/startup.el @@ -1492,7 +1492,7 @@ where FACE is a valid face specification, as it can be used with ;; show user what they all are. But leave the last one current. (and (> file-count 2) (not noninteractive) - (not inhibit-startup-buffer-menu) + (not inhibit-startup-buffer-menu) (or (get-buffer-window first-file-buffer) (list-buffers)))) @@ -1503,7 +1503,8 @@ where FACE is a valid face specification, as it can be used with (string= (buffer-name) "*scratch*") ;; Don't display startup screen if init file ;; has started some sort of server. - (null (process-list)) + (not (and (fboundp 'process-list) + (process-list))) ;; Don't display startup screen if init file ;; has inserted some text in *scratch*. (= 0 (buffer-size))) |