(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.

2 files changed, 7 insertions, 15 deletions

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 73d3c8d9b3c..fa062b2b3d4 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,5 +1,10 @@
 2000-10-12  Gerd Moellmann  <gerd@gnu.org>
 
+        * startup.el (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.
+
         * calendar/diary-lib.el (diary-cyclic): Doc fix from Ed Reingold.
 
         * progmodes/scheme.el (scheme-mode-map): Use lisp-mode-shared-map
diff --git a/lisp/startup.el b/lisp/startup.el
index e4656e8e9fc..a6aae252045 100644
--- a/lisp/startup.el
+++ b/lisp/startup.el
@@ -989,6 +989,7 @@ where FACE is a valid face specification, as it can be used with
     (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 @@ where FACE is a valid face specification, as it can be used with
   (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 @@ where FACE is a valid face specification, as it can be used with
                 (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 @@ Type \\[describe-distribution] for information on getting the latest version."))
                      (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.