* finder.el: Bind finder-exit to 'q', not 'x'; the former is the

[gnu-emacs] / lisp / loadup.el

diff --git a/lisp/loadup.el b/lisp/loadup.el
index f99599668611383d9944aa1b384d42c93325aee3..bdd438de77d1881f2476f2e1f9aad33732000a9c 100644 (file)
--- a/lisp/loadup.el
+++ b/lisp/loadup.el
@@ -27,6 +27,9 @@
 
 ;;; 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*")
 
@@ -119,11 +122,9 @@
       (setq name (concat (expand-file-name "../etc/DOC-") name))
       (if (file-exists-p name)
          (delete-file name))
-      (copy-file (expand-file-name "../etc/DOC")
-                name
-                t)
+      (copy-file (expand-file-name "../etc/DOC") name t)
       (Snarf-documentation (file-name-nondirectory name)))
-  (Snarf-documentation "DOC"))
+    (Snarf-documentation "DOC"))
 (message "Finding pointers to doc strings...done")
 
 ;Note: You can cause additional libraries to be preloaded
@@ -147,18 +148,22 @@
          (setq name (concat (downcase (substring name 0 (match-beginning 0)))
                             "-"
                             (substring name (match-end 0)))))
-       (message "Dumping under names xemacs and %s" name))
+       (message "Dumping under names emacs and %s" name))
       (condition-case ()
-         (delete-file "xemacs")
+         (delete-file "emacs")
        (file-error nil))
-      (dump-emacs "xemacs" "temacs")
+      ;; We used to dump under the name xemacs, but that occasionally
+      ;; confused people installing Emacs (they'd install the file
+      ;; under the name `xemacs'), and it's inconsistent with every
+      ;; other GNU product's build process.
+      (dump-emacs "emacs" "temacs")
       ;; Recompute NAME now, so that it isn't set when we dump.
       (let ((name (concat "emacs-" emacs-version)))
        (while (string-match "[^-+_.a-zA-Z0-9]+" name)
          (setq name (concat (downcase (substring name 0 (match-beginning 0)))
                             "-"
                             (substring name (match-end 0)))))
-       (add-name-to-file "xemacs" name t))
+       (add-name-to-file "emacs" name t))
       (kill-emacs)))
 
 ;; Avoid error if user loads some more libraries now.