mirror/emacs
1
0
Fork 0
mirror of https://git.savannah.gnu.org/git/emacs.git synced 2024-12-27 10:54:40 +00:00
Code Issues Releases Activity

(normal-splash-screen): Fix last change so we don't wait

Browse Source 
2 minutes if we don't show the splash screen.
This commit is contained in:
Stefan Monnier 2006-04-11 16:37:27 +00:00
parent 83163ec728
commit 866d0913b1
2 changed files with 18 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
lisp/ChangeLog
View File

@ -1,3 +1,8 @@
2006-04-11 Stefan Monnier <monnier@iro.umontreal.ca>
* startup.el (normal-splash-screen): Fix last change so we don't wait
2 minutes if we don't show the splash screen.
2006-04-11 Carsten Dominik <dominik@science.uva.nl>
* textmodes/org.el (org-export-plain-list-max-depth)
@ -17,14 +22,14 @@
(org-table-create-or-convert-from-region): New commands
(org-table-toggle-vline-visibility): Command removed.
(org-table-convert-region): Made a command.
(orgtbl-deleta-backward-char,orgtbl-delete-char): Commands
removed, replaced with the normal org- functions.
(orgtbl-deleta-backward-char,orgtbl-delete-char): Remove commands.
Replace with the normal org- functions.
(org-self-insert-command): Don't trigger realign unnecessarily
when blanking a field that is not full.
(org-mode): `Set buffer-invisibility-spec' for links.
(org-activate-links2): Hide link part and only show descriptive
part of the link.
(org-insert-link): Modified for new linking system.
(org-insert-link): Modify for new linking system.
(org-store-link): Store description separately, for use by
`org-insert-link'.
(org-table-align): Use `org-string-width'.
@ -67,8 +72,7 @@
2006-04-10 Eli Zaretskii <eliz@gnu.org>
* international/mule-cmds.el (set-locale-environment): Fix last
change for when the locale's preferences don't specify any
encoding.
change for when the locale's preferences don't specify any encoding.
2006-04-10 Stefan Monnier <monnier@iro.umontreal.ca>

20
lisp/startup.el
View File

@ -1534,17 +1534,15 @@ Type \\[describe-distribution] for information on getting the latest version."))
;; 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"))))