(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 ba89a76..dc0c393 100644 (file)
--- a/lisp/loadup.el
+++ b/lisp/loadup.el
@@ -1,13 +1,15 @@
 ;;; loadup.el --- load up standardly loaded Lisp files for Emacs.
 
-;; This is loaded into a bare Emacs to make a dumpable one.
 ;; Copyright (C) 1985, 1986, 1992 Free Software Foundation, Inc.
 
+;; Maintainer: FSF
+;; Keywords: internal
+
 ;; This file is part of GNU Emacs.
 
 ;; GNU Emacs is free software; you can redistribute it and/or modify
 ;; it under the terms of the GNU General Public License as published by
-;; the Free Software Foundation; either version 1, or (at your option)
+;; the Free Software Foundation; either version 2, or (at your option)
 ;; any later version.
 
 ;; GNU Emacs is distributed in the hope that it will be useful,
@@ -19,12 +21,21 @@
 ;; along with GNU Emacs; see the file COPYING.  If not, write to
 ;; the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.
 
+;;; Commentary:
+
+;; This is loaded into a bare Emacs to make a dumpable one.
+
+;;; 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*")
 
 (load "subr")
 (garbage-collect)
-(load "bytecomp-runtime")
+(load "byte-run")
 (garbage-collect)
 (load "map-ynp")
 (garbage-collect)
@@ -40,8 +51,13 @@
 (garbage-collect)
 (load "window")
 (garbage-collect)
-(if (fboundp 'delete-screen)
-    (load "screen"))
+(if (fboundp 'delete-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)
@@ -82,6 +98,8 @@
     (progn             ; floating pt. functions if 
       (garbage-collect)        ; we have float support.
       (load "float-sup")))
+(garbage-collect)
+(load "vc-hooks")
 
 ;If you want additional libraries to be preloaded and their
 ;doc strings kept in the DOC file rather than in core,
@@ -106,10 +124,11 @@
        (setq name (concat (downcase (substring name 0 (match-beginning 0)))
                           "-"
                           (substring name (match-end 0)))))
-      (copy-file (expand-file-name "../etc/DOC")
-                (concat (expand-file-name "../etc/DOC-") name)
-                t)
-      (Snarf-documentation (concat "DOC-" name)))
+      (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)
+      (Snarf-documentation (file-name-nondirectory name)))
     (Snarf-documentation "DOC"))
 (message "Finding pointers to doc strings...done")
 
@@ -134,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.