diff options
| author | Juri Linkov | 2007-08-24 22:18:04 +0000 |
|---|---|---|
| committer | Juri Linkov | 2007-08-24 22:18:04 +0000 |
| commit | fa7e0e98d9034ff8ba48bc3f293b6517f1fa374e (patch) | |
| tree | 17d6f58f9fa4ada120c595133ca0802613a80f41 | |
| parent | e9acd138fad958de844979f525594a7a7e336f72 (diff) | |
| download | emacs-fa7e0e98d9034ff8ba48bc3f293b6517f1fa374e.tar.gz emacs-fa7e0e98d9034ff8ba48bc3f293b6517f1fa374e.zip | |
More fixes for 2007-08-21 merge conflict.
| -rw-r--r-- | lisp/startup.el | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/lisp/startup.el b/lisp/startup.el index 85c6af601dc..d351e84c87c 100644 --- a/lisp/startup.el +++ b/lisp/startup.el | |||
| @@ -1372,7 +1372,8 @@ Warning Warning!!! Pure space overflow !!!Warning Warning | |||
| 1372 | 1372 | ||
| 1373 | (defun exit-splash-screen () | 1373 | (defun exit-splash-screen () |
| 1374 | "Stop displaying the splash screen buffer." | 1374 | "Stop displaying the splash screen buffer." |
| 1375 | (if (get-buffer "*About GNU Emacs*") | 1375 | (interactive) |
| 1376 | (if fancy-splash-outer-buffer | ||
| 1376 | (throw 'stop-splashing nil) | 1377 | (throw 'stop-splashing nil) |
| 1377 | (quit-window t))) | 1378 | (quit-window t))) |
| 1378 | 1379 | ||