diff options
| author | Chong Yidong | 2007-03-17 17:59:07 +0000 |
|---|---|---|
| committer | Chong Yidong | 2007-03-17 17:59:07 +0000 |
| commit | 2a30c37b66712b0b700af1d097bdf91bbf37924b (patch) | |
| tree | 91d79eb2449f6d83685b0f389910cd32bb2ccdc5 | |
| parent | 11c5be91d7c3d55ab137ad0977bd38dcdf537250 (diff) | |
| download | emacs-2a30c37b66712b0b700af1d097bdf91bbf37924b.tar.gz emacs-2a30c37b66712b0b700af1d097bdf91bbf37924b.zip | |
(command-line-1): Make insertion of initial-scratch-message not depend
on scratch being selected.
| -rw-r--r-- | lisp/startup.el | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/lisp/startup.el b/lisp/startup.el index 9192222ec88..7e6b4f9ac36 100644 --- a/lisp/startup.el +++ b/lisp/startup.el | |||
| @@ -1995,13 +1995,13 @@ With a prefix argument, any user input hides the splash screen." | |||
| 1995 | (with-no-warnings | 1995 | (with-no-warnings |
| 1996 | (setq menubar-bindings-done t)) | 1996 | (setq menubar-bindings-done t)) |
| 1997 | 1997 | ||
| 1998 | ;; If *scratch* is selected and it is empty, insert an | 1998 | ;; If *scratch* exists and is empty, insert initial-scratch-message. |
| 1999 | ;; initial message saying not to create a file there. | 1999 | (and initial-scratch-message |
| 2000 | (when (and initial-scratch-message | 2000 | (get-buffer "*scratch*") |
| 2001 | (equal (buffer-name) "*scratch*") | 2001 | (with-current-buffer "*scratch*" |
| 2002 | (= 0 (buffer-size))) | 2002 | (when (zerop (buffer-size)) |
| 2003 | (insert initial-scratch-message) | 2003 | (insert initial-scratch-message) |
| 2004 | (set-buffer-modified-p nil)) | 2004 | (set-buffer-modified-p nil)))) |
| 2005 | 2005 | ||
| 2006 | ;; If user typed input during all that work, | 2006 | ;; If user typed input during all that work, |
| 2007 | ;; abort the startup screen. Otherwise, display it now. | 2007 | ;; abort the startup screen. Otherwise, display it now. |