From: Eli Zaretskii Date: Mon, 26 Nov 2001 19:41:57 +0000 (+0000) Subject: (command-line-1): Don't try to call process-list if it is not fboundp. X-Git-Tag: ttn-vms-21-2-B4~18115 X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=26780e5b6be7b5bbdf56bb299fea43a3820ddc6d;p=emacs.git (command-line-1): Don't try to call process-list if it is not fboundp. --- 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 + + * startup.el (command-line-1): Don't try to call process-list if + it is not fboundp. + 2001-11-26 Sam Steingold * 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)))