aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorEli Zaretskii2001-11-26 19:41:57 +0000
committerEli Zaretskii2001-11-26 19:41:57 +0000
commit26780e5b6be7b5bbdf56bb299fea43a3820ddc6d (patch)
tree285a39f32562a9ccd814b0a25eec745db91d42a8
parentbc5c763a1bc97032789b192f8496388418a06f5b (diff)
downloademacs-26780e5b6be7b5bbdf56bb299fea43a3820ddc6d.tar.gz
emacs-26780e5b6be7b5bbdf56bb299fea43a3820ddc6d.zip
(command-line-1): Don't try to call process-list if it is not fboundp.
-rw-r--r--lisp/ChangeLog5
-rw-r--r--lisp/startup.el5
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 @@
12001-11-26 Eli Zaretskii <eliz@is.elta.co.il>
2
3 * startup.el (command-line-1): Don't try to call process-list if
4 it is not fboundp.
5
12001-11-26 Sam Steingold <sds@gnu.org> 62001-11-26 Sam Steingold <sds@gnu.org>
2 7
3 * frame.el (show-trailing-whitespace): Remove :set argument (the 8 * 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
1492 ;; show user what they all are. But leave the last one current. 1492 ;; show user what they all are. But leave the last one current.
1493 (and (> file-count 2) 1493 (and (> file-count 2)
1494 (not noninteractive) 1494 (not noninteractive)
1495 (not inhibit-startup-buffer-menu) 1495 (not inhibit-startup-buffer-menu)
1496 (or (get-buffer-window first-file-buffer) 1496 (or (get-buffer-window first-file-buffer)
1497 (list-buffers)))) 1497 (list-buffers))))
1498 1498
@@ -1503,7 +1503,8 @@ where FACE is a valid face specification, as it can be used with
1503 (string= (buffer-name) "*scratch*") 1503 (string= (buffer-name) "*scratch*")
1504 ;; Don't display startup screen if init file 1504 ;; Don't display startup screen if init file
1505 ;; has started some sort of server. 1505 ;; has started some sort of server.
1506 (null (process-list)) 1506 (not (and (fboundp 'process-list)
1507 (process-list)))
1507 ;; Don't display startup screen if init file 1508 ;; Don't display startup screen if init file
1508 ;; has inserted some text in *scratch*. 1509 ;; has inserted some text in *scratch*.
1509 (= 0 (buffer-size))) 1510 (= 0 (buffer-size)))