/[emacs]/emacs/lisp/startup.el
ViewVC logotype

Diff of /emacs/lisp/startup.el

Parent Directory Parent Directory | Revision Log Revision Log | View Patch Patch

revision 1.277 by rms, Sun Nov 25 19:16:10 2001 UTC revision 1.278 by eliz, Mon Nov 26 19:40:54 2001 UTC
# Line 1492  where FACE is a valid face specification Line 1492  where FACE is a valid face specification
1492          ;; show user what they all are.  But leave the last one current.          ;; show user what they all are.  But leave the last one current.
1493          (and (> file-count 2)          (and (> file-count 2)
1494               (not noninteractive)               (not noninteractive)
1495               (not inhibit-startup-buffer-menu)                   (not inhibit-startup-buffer-menu)
1496               (or (get-buffer-window first-file-buffer)               (or (get-buffer-window first-file-buffer)
1497                   (list-buffers))))                   (list-buffers))))
1498    
# Line 1503  where FACE is a valid face specification Line 1503  where FACE is a valid face specification
1503                 (string= (buffer-name) "*scratch*")                 (string= (buffer-name) "*scratch*")
1504                 ;; Don't display startup screen if init file                 ;; Don't display startup screen if init file
1505                 ;; has started some sort of server.                 ;; has started some sort of server.
1506                 (null (process-list))                 (not (and (fboundp 'process-list)
1507                             (process-list)))
1508                 ;; Don't display startup screen if init file                 ;; Don't display startup screen if init file
1509                 ;; has inserted some text in *scratch*.                 ;; has inserted some text in *scratch*.
1510                 (= 0 (buffer-size)))                 (= 0 (buffer-size)))

Legend:
Removed from v.1.277  
changed lines
  Added in v.1.278

savannah-hackers-public@gnu.org
ViewVC Help
Powered by ViewVC 1.1.26