Mercurial > emacs
changeset 32417:f1092988f808
(fancy-splash-screens): Don't add a pre-command hook.
(fancy-splash-pre-command, fancy-splash-pending-command): Removed.
(command-line-1): Don't use fancy-splash-pending-command.
(fancy-splash-screens-1): Goto point-min after inserting text.
| author | Gerd Moellmann <gerd@gnu.org> |
|---|---|
| date | Thu, 12 Oct 2000 12:07:04 +0000 |
| parents | 33e158ac4449 |
| children | 425c90c35709 |
| files | lisp/startup.el |
| diffstat | 1 files changed, 2 insertions(+), 15 deletions(-) [+] |
line wrap: on
line diff
--- a/lisp/startup.el Thu Oct 12 11:53:30 2000 +0000 +++ b/lisp/startup.el Thu Oct 12 12:07:04 2000 +0000 @@ -989,6 +989,7 @@ (unless (current-message) (message fancy-splash-help-echo)) (set-buffer-modified-p nil) + (goto-char (point-min)) (force-mode-line-update) (setq fancy-current-text (cdr fancy-current-text)))) @@ -1000,16 +1001,6 @@ (throw 'exit nil)) -(defvar fancy-splash-pending-command nil - "If non-nil, a command to be executed after the splash screen display.") - -(defun fancy-splash-pre-command () - (unless (memq this-command - '(ignore fancy-splash-default-action browse-url)) - (setq fancy-splash-pending-command this-command) - (throw 'exit nil))) - - (defun fancy-splash-screens () "Display fancy splash screens when Emacs starts." (setq fancy-splash-help-echo (startup-echo-area-message)) @@ -1029,7 +1020,6 @@ (propertize "---- %b %-" 'face '(:weight bold)) timer (run-with-timer 0 5 #'fancy-splash-screens-1 splash-buffer)) - (add-hook 'pre-command-hook 'fancy-splash-pre-command) (recursive-edit)) (cancel-timer timer) (remove-hook 'pre-command-hook 'fancy-splash-pre-command) @@ -1237,10 +1227,7 @@ (erase-buffer) (when initial-scratch-message (insert initial-scratch-message)) - (set-buffer-modified-p nil)) - - (when fancy-splash-pending-command - (call-interactively fancy-splash-pending-command))))))) + (set-buffer-modified-p nil))))))) ;; Delay 2 seconds after the init file error message ;; was displayed, so user can read it.