[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Emacs-diffs] Changes to emacs/lisp/startup.el
From: |
Stefan Monnier |
Subject: |
[Emacs-diffs] Changes to emacs/lisp/startup.el |
Date: |
Tue, 11 Apr 2006 16:37:28 +0000 |
Index: emacs/lisp/startup.el
diff -u emacs/lisp/startup.el:1.400 emacs/lisp/startup.el:1.401
--- emacs/lisp/startup.el:1.400 Wed Apr 5 14:10:41 2006
+++ emacs/lisp/startup.el Tue Apr 11 16:37:27 2006
@@ -1534,17 +1534,15 @@
;; Display the input that we set up in the buffer.
(set-buffer-modified-p nil)
(goto-char (point-min))
- (save-window-excursion
- (condition-case nil
- (switch-to-buffer (current-buffer))
- ;; In case we're in a dedicated or minibuffer-only window.
- (error
- ;; There's no point is using pop-to-buffer since creating
- ;; a new frame will generate enough events that the
- ;; subsequent `sit-for' will immediately return anyway.
- ;; (pop-to-buffer (current-buffer))
- ))
- (sit-for 120)))
+ (if (or (window-minibuffer-p)
+ (window-dedicated-p (selected-window)))
+ ;; There's no point is using pop-to-buffer since creating
+ ;; a new frame will generate enough events that the
+ ;; subsequent `sit-for' will immediately return anyway.
+ nil ;; (pop-to-buffer (current-buffer))
+ (save-window-excursion
+ (switch-to-buffer (current-buffer))
+ (sit-for 120))))
;; Unwind ... ensure splash buffer is killed
(kill-buffer "GNU Emacs"))))