(describe-project): New function, on C-h C-p.

[bpt/emacs.git] / lisp / loadup.el

diff --git a/lisp/loadup.el b/lisp/loadup.el
index f13f6c7..dc0c393 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*")
 
@@ -49,7 +52,12 @@
 (load "window")
 (garbage-collect)
 (if (fboundp 'delete-frame)
-    (load "frame"))
+    (progn
+      (load "frame")
+      (load "mouse")
+      (garbage-collect)
+      (load "scroll-bar")
+      (load "select")))
 (garbage-collect)
 (load "paths.el")  ;Don't get confused if someone compiled paths by mistake.
 (garbage-collect)
@@ -145,18 +153,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.