Mercurial > emacs
changeset 83659:b2a46adb61f1
More fixes for 2007-08-21 merge conflict.
author | Juri Linkov <juri@jurta.org> |
---|---|
date | Fri, 24 Aug 2007 22:18:04 +0000 |
parents | 2ee129d4ca11 |
children | 4c8cc4706449 |
files | lisp/startup.el |
diffstat | 1 files changed, 2 insertions(+), 1 deletions(-) [+] |
line wrap: on
line diff
--- a/lisp/startup.el Fri Aug 24 06:05:22 2007 +0000 +++ b/lisp/startup.el Fri Aug 24 22:18:04 2007 +0000 @@ -1372,7 +1372,8 @@ (defun exit-splash-screen () "Stop displaying the splash screen buffer." - (if (get-buffer "*About GNU Emacs*") + (interactive) + (if fancy-splash-outer-buffer (throw 'stop-splashing nil) (quit-window t)))