Github/emacs
2
0
Fork 1
mirror of git://git.sv.gnu.org/emacs.git synced 2026-02-18 10:57:34 +00:00
Code Issues Projects Releases Packages Wiki Activity

(command-line-1): Don't try to call process-list if it is not fboundp.

Browse source
This commit is contained in:
Eli Zaretskii 2001-11-26 19:41:57 +00:00
parent bc5c763a1b
commit 26780e5b6b
2 changed files with 8 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
lisp/ChangeLog
View file

@ -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

5
lisp/startup.el
View file

@ -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)))