Don't test for presence of dump-emacs.

Use `dump' argument as criterion for copying DOC, for running
top-level, and for extending the version number.
Delete the sleep-for.

1 files changed, 7 insertions, 4 deletions

diff --git a/lisp/loadup.el b/lisp/loadup.el
index 1f5063e0480..b7e0368b1ac 100644
--- a/lisp/loadup.el
+++ b/lisp/loadup.el
@@ -28,7 +28,6 @@
 ;;; Code:
 
 (message "Using load-path %s" load-path)
-(sleep-for 1)
 
 ;;; We don't want to have any undo records in the dumped Emacs.
 (buffer-disable-undo "*scratch*")
@@ -137,7 +136,9 @@
 
 ;; Determine which last version number to use
 ;; based on the executables that now exist.
-(if (and (fboundp 'dump-emacs) (not (eq system-type 'ms-dos)))
+(if (and (or (equal (nth 3 command-line-args) "dump")
+             (equal (nth 4 command-line-args) "dump"))
+         (not (eq system-type 'ms-dos)))
     (let* ((base (concat "emacs-" emacs-version))
            (files (file-name-all-completions base default-directory))
            (versions (mapcar (function (lambda (name)
@@ -155,7 +156,8 @@
 ;; for DOC will not have doc strings in the dumped Emacs.
 
 (message "Finding pointers to doc strings...")
-(if (fboundp 'dump-emacs)
+(if (or (equal (nth 3 command-line-args) "dump")
+        (equal (nth 4 command-line-args) "dump"))
     (let ((name emacs-version))
       (while (string-match "[^-+_.a-zA-Z0-9]+" name)
         (setq name (concat (downcase (substring name 0 (match-beginning 0)))
@@ -220,7 +222,8 @@
 ;; this file must be loaded each time Emacs is run.
 ;; So run the startup code now.
 
-(or (fboundp 'dump-emacs)
+(or (or (equal (nth 3 command-line-args) "dump")
+        (equal (nth 4 command-line-args) "dump"))
     (eval top-level))
 
 ;;; loadup.el ends here