Mercurial > emacs

comparison lisp/startup.el @ 90384:c156f6a9e7b5

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Revision: emacs@sv.gnu.org/emacs--unicode--0--patch-56 Merge from emacs--devo--0 Patches applied: * emacs--devo--0 (patch 204-225) - Update from CVS - Sync from erc--emacs--0 - Merge from gnus--rel--5.10 - Improve tq.el. - Update from CVS: src/puresize.h (PURESIZE_RATIO): Reduce to 10/6. * gnus--rel--5.10 (patch 81-85) - Update from CVS - Merge from emacs--devo--0
author Miles Bader <miles@gnu.org>
date Mon, 17 Apr 2006 08:41:12 +0000
parents 65ca8fb66a0d 86291f09f3d1
children 2ecafc6d5db7
comparison
equal deleted inserted replaced
90383:ab20fb198dda 90384:c156f6a9e7b5
1536 " the files you were editing.")) 1536 " the files you were editing."))
1537 1537
1538 ;; Display the input that we set up in the buffer. 1538 ;; Display the input that we set up in the buffer.
1539 (set-buffer-modified-p nil) 1539 (set-buffer-modified-p nil)
1540 (goto-char (point-min)) 1540 (goto-char (point-min))
1541 (save-window-excursion 1541 (if (or (window-minibuffer-p)
1542 (condition-case nil 1542 (window-dedicated-p (selected-window)))
1543 (switch-to-buffer (current-buffer)) 1543 ;; There's no point is using pop-to-buffer since creating
1544 ;; In case we're in a dedicated or minibuffer-only window. 1544 ;; a new frame will generate enough events that the
1545 (error 1545 ;; subsequent `sit-for' will immediately return anyway.
1546 ;; There's no point is using pop-to-buffer since creating 1546 nil ;; (pop-to-buffer (current-buffer))
1547 ;; a new frame will generate enough events that the 1547 (save-window-excursion
1548 ;; subsequent `sit-for' will immediately return anyway. 1548 (switch-to-buffer (current-buffer))
1549 ;; (pop-to-buffer (current-buffer)) 1549 (sit-for 120))))
1550 ))
1551 (sit-for 120)))
1552 ;; Unwind ... ensure splash buffer is killed 1550 ;; Unwind ... ensure splash buffer is killed
1553 (kill-buffer "GNU Emacs")))) 1551 (kill-buffer "GNU Emacs"))))
1554 1552
1555 1553
1556 (defun startup-echo-area-message () 1554 (defun startup-echo-area-message ()