X-Git-Url: https://code.delx.au/gnu-emacs/blobdiff_plain/9b73022fafc1bcf74b62ae7debb7988b8594c94f..16808556788c40f60b0c330396237dd62ba4de83:/lisp/loadup.el

diff --git a/lisp/loadup.el b/lisp/loadup.el
index 5ed8d26cf8..db5bcb9ea5 100644
--- a/lisp/loadup.el
+++ b/lisp/loadup.el
@@ -1,6 +1,6 @@
-;;; loadup.el --- load up standardly loaded Lisp files for Emacs.
+;;; loadup.el --- load up standardly loaded Lisp files for Emacs
 
-;; Copyright (C) 1985, 1986, 1992, 1994 Free Software Foundation, Inc.
+;; Copyright (C) 1985, 1986, 1992, 1994, 2001 Free Software Foundation, Inc.
 
 ;; Maintainer: FSF
 ;; Keywords: internal
@@ -28,163 +28,153 @@
 
 ;;; Code:
 
+;; add subdirectories to the load-path for files that might
+;; get autoloaded when bootstrapping
+(if (or (equal (nth 3 command-line-args) "bootstrap")
+	(equal (nth 4 command-line-args) "bootstrap")
+	;; in case CANNOT_DUMP
+	(equal (nth 0 command-line-args) "../src/bootstrap-emacs"))
+    (let ((path (car load-path)))
+      (setq load-path (list path
+			    (expand-file-name "emacs-lisp" path)
+			    (expand-file-name "international" path)))))
+
 (message "Using load-path %s" load-path)
 
 ;;; We don't want to have any undo records in the dumped Emacs.
 (buffer-disable-undo "*scratch*")
 
+(load "byte-run")
 (load "subr")
 
 ;; We specify .el in case someone compiled version.el by mistake.
 (load "version.el")
 
-(garbage-collect)
-(load "byte-run")
-(garbage-collect)
-(load "map-ynp")
-(garbage-collect)
 (load "widget")
-(garbage-collect)
 (load "custom")
+(load "emacs-lisp/backquote")
+(load "map-ynp")
+(load "env")
 (load "cus-start")
-(garbage-collect)
-(load "loaddefs.el")  ;Don't get confused if someone compiled this by mistake.
-(garbage-collect)
-(load "mule")
-(garbage-collect)
-(load "mule-conf.el") ;Don't get confused if someone compiled this by mistake.
-(garbage-collect)
+(load "international/mule")
+(load "international/mule-conf.el") ;Don't get confused if someone compiled this by mistake.
+(load "format")
 (load "bindings")
 (setq load-source-file-function 'load-with-code-conversion)
-(garbage-collect)
 (load "simple")
-(garbage-collect)
-(load "help")
-(garbage-collect)
 (load "files")
-(garbage-collect)
-(load "format")
+
+(load "faces")  ; after here, `defface' may be used.
+
+(message "Lists of integers (garbage collection statistics) are normal output")
+(message "while building Emacs; they do not indicate a problem.")
+(message "%s" (garbage-collect))
+(load "loaddefs.el")  ;Don't get confused if someone compiled this by mistake.
+(message "%s" (garbage-collect))
+
+(load "help")
+
 ;; Any Emacs Lisp source file (*.el) loaded here after can contain
 ;; multilingual text.
-(garbage-collect)
-(load "mule-cmds")
-(garbage-collect)
-(load "characters")
-(garbage-collect)
-;; Load langauge specific files.
+(load "international/mule-cmds")
+(load "case-table")
+(load "international/characters")
+(load "international/utf-8")
+
+(let ((set-case-syntax-set-multibyte t))
+  (load "international/latin-1")
+  (load "international/latin-2")
+  (load "international/latin-3")
+  (load "international/latin-4")
+  (load "international/latin-5")
+  (load "international/latin-8")
+  (load "international/latin-9"))
+;; Load language-specific files.
 (load "language/chinese")
-(garbage-collect)
 (load "language/cyrillic")
-(garbage-collect)
 (load "language/indian")
-(garbage-collect)
-(load "language/devanagari")
-(garbage-collect)
+(load "language/devanagari")		; This should be loaded after indian.
 (load "language/english")
-(garbage-collect)
 (load "language/ethiopic")
-(garbage-collect)
 (load "language/european")
-(garbage-collect)
+(load "language/czech")
+(load "language/slovak")
+(load "language/romanian")
 (load "language/greek")
-(garbage-collect)
 (load "language/hebrew")
-(garbage-collect)
 (load "language/japanese")
-(garbage-collect)
 (load "language/korean")
-(garbage-collect)
 (load "language/lao")
-(garbage-collect)
 (load "language/thai")
-(garbage-collect)
 (load "language/tibetan")
-(garbage-collect)
 (load "language/vietnamese")
-(garbage-collect)
 (load "language/misc-lang")
-(garbage-collect)
+(update-coding-systems-internal)
+
 (load "indent")
-(garbage-collect)
-(load "isearch")
-(garbage-collect)
 (load "window")
-(garbage-collect)
 (load "frame")
+(load "term/tty-colors")
+
 (if (fboundp 'frame-face-alist)
     (progn
-      (garbage-collect)
-      (load "faces")
       (load "facemenu")))
 (if (fboundp 'track-mouse)
     (progn
-      (garbage-collect)
       (load "mouse")
-      (garbage-collect)
-      (load "scroll-bar")
+      (and (boundp 'x-toolkit-scroll-bars)
+	   (load "scroll-bar"))
       (load "select")))
+(load "isearch")
+
+(message "%s" (garbage-collect))
 (load "menu-bar")
-(garbage-collect)
 (load "paths.el")  ;Don't get confused if someone compiled paths by mistake.
-(garbage-collect)
 (load "startup")
-(garbage-collect)
-(load "lisp")
-(garbage-collect)
-(load "page")
-(garbage-collect)
+(load "emacs-lisp/lisp")
+(load "textmodes/page")
 (load "register")
-(garbage-collect)
-(load "paragraphs")
-(garbage-collect)
-(load "lisp-mode")
-(garbage-collect)
-(load "text-mode")
-(garbage-collect)
-(load "fill")
-(garbage-collect)
+(load "textmodes/paragraphs")
+(load "emacs-lisp/lisp-mode")
+(load "textmodes/text-mode")
+(load "textmodes/fill")
+(message "%s" (garbage-collect))
+
 (load "replace")
 (if (eq system-type 'vax-vms)
     (progn
-      (garbage-collect)
       (load "vmsproc")))
-(garbage-collect)
 (load "abbrev")
-(garbage-collect)
 (load "buff-menu")
 (if (eq system-type 'vax-vms)
     (progn
-      (garbage-collect)
       (load "vms-patch")))
 (if (eq system-type 'windows-nt)
     (progn
-      (garbage-collect)
       (load "ls-lisp")
-      (garbage-collect)
       (load "disp-table") ; needed to setup ibm-pc char set, see internal.el
-      (garbage-collect)
       (load "dos-w32")
-      (garbage-collect)
-      (load "w32-fns")
-      (garbage-collect)))
+      (load "w32-fns")))
 (if (eq system-type 'ms-dos)
     (progn
       (load "ls-lisp")
-      (garbage-collect)
       (load "dos-w32")
-      (garbage-collect)
       (load "dos-fns")
-      (garbage-collect)
-      (load "disp-table") ; needed to setup ibm-pc char set, see internal.el
-      (garbage-collect)))
-(if (fboundp 'atan)	; preload some constants and 
-    (progn		; floating pt. functions if 
-      (garbage-collect)	; we have float support.
+      (load "dos-vars")
+      (load "international/ccl")	; codepage.el uses CCL en/decoder
+      (load "international/codepage")	; internal.el uses cpNNN coding systems
+      (load "disp-table"))) ; needed to setup ibm-pc char set, see internal.el
+(if (eq system-type 'macos)
+    (progn
+      (load "ls-lisp")))
+(if (fboundp 'atan)	; preload some constants and
+    (progn		; floating pt. functions if we have float support.
       (load "float-sup")))
+(message "%s" (garbage-collect))
 
-(garbage-collect)
 (load "vc-hooks")
 (load "ediff-hook")
+(message "%s" (garbage-collect))
 
 ;If you want additional libraries to be preloaded and their
 ;doc strings kept in the DOC file rather than in core,
@@ -238,23 +228,62 @@
 	    (delete-file name))
 	(copy-file (expand-file-name "../etc/DOC") name t))
       (Snarf-documentation (file-name-nondirectory name)))
-    (Snarf-documentation "DOC"))
+    (condition-case nil
+	(Snarf-documentation "DOC")
+      (error nil)))
 (message "Finding pointers to doc strings...done")
 
-;Note: You can cause additional libraries to be preloaded
-;by writing a site-init.el that loads them.
-;See also "site-load" above.
+;;;Note: You can cause additional libraries to be preloaded
+;;;by writing a site-init.el that loads them.
+;;;See also "site-load" above.
 (load "site-init" t)
 (setq current-load-list nil)
+
+;; Write the value of load-history into fns-VERSION.el,
+;; then clear out load-history.
+(if (or (equal (nth 3 command-line-args) "dump")
+	(equal (nth 4 command-line-args) "dump"))
+    (let ((buffer-undo-list t))
+      (princ "(setq load-history\n" (current-buffer))
+      (princ "      (nconc load-history\n" (current-buffer))
+      (princ "             '(" (current-buffer))
+      (let ((tem load-history))
+	(while tem
+	  (prin1 (car tem) (current-buffer))
+	  (terpri (current-buffer))
+	  (if (cdr tem)
+	      (princ "               " (current-buffer)))
+	  (setq tem (cdr tem))))
+      (princ ")))\n" (current-buffer))
+      (write-region (point-min) (point-max)
+		    (expand-file-name
+		     (cond
+		      ((eq system-type 'ms-dos)
+		       "../lib-src/fns.el")
+		      ((eq system-type 'windows-nt)
+		       (format "../../../lib-src/fns-%s.el" emacs-version))
+		      (t
+		       (format "../lib-src/fns-%s.el" emacs-version)))
+		     invocation-directory))
+      (erase-buffer)
+      (setq load-history nil))
+  (setq symbol-file-load-history-loaded t))
+(set-buffer-modified-p nil)
+
+;; reset the load-path.  See lread.c:init_lread why.
+(if (or (equal (nth 3 command-line-args) "bootstrap")
+	(equal (nth 4 command-line-args) "bootstrap"))
+    (setcdr load-path nil))
+
 (garbage-collect)
 
 ;;; At this point, we're ready to resume undo recording for scratch.
 (buffer-enable-undo "*scratch*")
 
-(if (or (equal (nth 3 command-line-args) "dump")
-	(equal (nth 4 command-line-args) "dump"))
+(if (or (member (nth 3 command-line-args) '("dump" "bootstrap"))
+	(member (nth 4 command-line-args) '("dump" "bootstrap")))
     (if (eq system-type 'vax-vms)
-	(progn 
+	(progn
 	  (message "Dumping data as file temacs.dump")
 	  (dump-emacs "temacs.dump" "temacs")
 	  (kill-emacs))
@@ -272,7 +301,7 @@
       ;; 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.
+      ;; other GNU program's build process.
       (dump-emacs "emacs" "temacs")
       (message "%d pure bytes used" pure-bytes-used)
       ;; Recompute NAME now, so that it isn't set when we dump.
@@ -290,13 +319,12 @@
 
 ;; For machines with CANNOT_DUMP defined in config.h,
 ;; this file must be loaded each time Emacs is run.
-;; So run the startup code now.
+;; So run the startup code now.  First, remove `-l loadup' from args.
 
-(or (equal (nth 3 command-line-args) "dump")
-    (equal (nth 4 command-line-args) "dump")
-    (progn
-      ;; Avoid loading loadup.el a second time!
-      (setq command-line-args (cdr (cdr command-line-args)))
-      (eval top-level)))
+(if (and (equal (nth 1 command-line-args) "-l")
+	 (equal (nth 2 command-line-args) "loadup"))
+    (setcdr command-line-args (nthcdr 3 command-line-args)))
+
+(eval top-level)
 
 ;;; loadup.el ends here