X-Git-Url: http://git.hcoop.net/bpt/emacs.git/blobdiff_plain/c90c0be0587f2dd3fdc1fa87a69d968361af1b76..dfe7296633a3b574b85adb0e47f2e0bcfee15efa:/lisp/loadup.el?ds=sidebyside

diff --git a/lisp/loadup.el b/lisp/loadup.el
index 3889786a7e..3cfe2595b2 100644
--- a/lisp/loadup.el
+++ b/lisp/loadup.el
@@ -1,6 +1,7 @@
-;;; 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, 2002, 2003,
+;;   2004, 2005, 2006 Free Software Foundation, Inc.
 
 ;; Maintainer: FSF
 ;; Keywords: internal
@@ -19,8 +20,8 @@
 
 ;; You should have received a copy of the GNU General Public License
 ;; along with GNU Emacs; see the file COPYING.  If not, write to the
-;; Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-;; Boston, MA 02111-1307, USA.
+;; Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+;; Boston, MA 02110-1301, USA.
 
 ;;; Commentary:
 
@@ -28,50 +29,88 @@
 
 ;;; 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 ((dir (car load-path)))
+      ;; We'll probably overflow the pure space.
+      (setq purify-flag nil)
+      (setq load-path (list dir
+			    (expand-file-name "emacs-lisp" dir)
+			    (expand-file-name "language" dir)
+			    (expand-file-name "international" dir)
+			    (expand-file-name "textmodes" dir)))))
+
 (message "Using load-path %s" load-path)
 
-;;; We don't want to have any undo records in the dumped Emacs.
-(buffer-disable-undo "*scratch*")
+;; We don't want to have any undo records in the dumped Emacs.
+(set-buffer "*scratch*")
+(setq buffer-undo-list t)
 
+(load "emacs-lisp/byte-run")
+(load "emacs-lisp/backquote")
 (load "subr")
 
 ;; We specify .el in case someone compiled version.el by mistake.
 (load "version.el")
 
-(load "byte-run")
-(load "map-ynp")
 (load "widget")
 (load "custom")
+(load "emacs-lisp/map-ynp")
+(load "env")
 (load "cus-start")
 (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)
+(load "files")
+
+(load "cus-face")
+(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 "simple")
+
 (load "help")
-(load "files")
-(load "format")
+
 ;; Any Emacs Lisp source file (*.el) loaded here after can contain
 ;; multilingual text.
 (load "international/mule-cmds")
 (load "case-table")
+(load "international/utf-8")
+(load "international/utf-16")
 (load "international/characters")
+
 (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 langauge specific files.
+  (load "international/latin-5")
+  (load "international/latin-8")
+  (load "international/latin-9"))
+;; Load language-specific files.
 (load "language/chinese")
 (load "language/cyrillic")
 (load "language/indian")
-(load "language/devanagari")		; This should be loaded after indian.
+(load "language/devanagari")	 ; This should be loaded after indian.
+(load "language/malayalam")	 ; This should be loaded after indian.
+(load "language/tamil")		 ; This should be loaded after indian.
+(load "language/kannada")	 ; This should be loaded after indian.
 (load "language/english")
 (load "language/ethiopic")
 (load "language/european")
 (load "language/czech")
 (load "language/slovak")
+(load "language/romanian")
 (load "language/greek")
 (load "language/hebrew")
 (load "language/japanese")
@@ -81,20 +120,36 @@
 (load "language/tibetan")
 (load "language/vietnamese")
 (load "language/misc-lang")
-(update-iso-coding-systems)
+(load "language/utf-8-lang")
+(load "language/georgian")
+
+(load "international/ucs-tables")
+
+(update-coding-systems-internal)
+
 (load "indent")
-(load "isearch")
 (load "window")
 (load "frame")
-(load "faces")
-(if (fboundp 'frame-face-alist)
-    (progn
-      (load "facemenu")))
+(load "term/tty-colors")
+(load "font-core")
+;; facemenu must be loaded before font-lock, because `facemenu-keymap'
+;; needs to be defined when font-lock is loaded.
+(load "facemenu")
+(load "emacs-lisp/syntax")
+(load "font-lock")
+(load "jit-lock")
+
 (if (fboundp 'track-mouse)
     (progn
       (load "mouse")
-      (load "scroll-bar")
+      (and (boundp 'x-toolkit-scroll-bars)
+	   (load "scroll-bar"))
       (load "select")))
+(load "emacs-lisp/timer")
+(load "isearch")
+(load "rfn-eshadow")
+
+(message "%s" (garbage-collect))
 (load "menu-bar")
 (load "paths.el")  ;Don't get confused if someone compiled paths by mistake.
 (load "startup")
@@ -105,13 +160,26 @@
 (load "emacs-lisp/lisp-mode")
 (load "textmodes/text-mode")
 (load "textmodes/fill")
-(garbage-collect)
+(message "%s" (garbage-collect))
+
 (load "replace")
 (if (eq system-type 'vax-vms)
     (progn
       (load "vmsproc")))
 (load "abbrev")
 (load "buff-menu")
+
+(if (fboundp 'x-create-frame)
+    (progn
+      (load "image")
+      (load "international/fontset")
+      (load "dnd")
+      (load "mwheel")
+      (load "tool-bar")))
+(if (featurep 'x)
+    (load "x-dnd"))
+(message "%s" (garbage-collect))
+
 (if (eq system-type 'vax-vms)
     (progn
       (load "vms-patch")))
@@ -120,22 +188,31 @@
       (load "ls-lisp")
       (load "disp-table") ; needed to setup ibm-pc char set, see internal.el
       (load "dos-w32")
+      (load "w32-vars")
       (load "w32-fns")))
 (if (eq system-type 'ms-dos)
     (progn
       (load "ls-lisp")
       (load "dos-w32")
       (load "dos-fns")
+      (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 (fboundp 'atan)	; preload some constants and 
+(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")))
-(garbage-collect)
-(load "loaddefs.el")  ;Don't get confused if someone compiled this by mistake.
+      (load "emacs-lisp/float-sup")))
+(message "%s" (garbage-collect))
 
-(garbage-collect)
 (load "vc-hooks")
+(load "jka-cmpr-hook")
 (load "ediff-hook")
+(if (fboundp 'x-show-tip) (load "tooltip"))
+
+(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,
@@ -162,11 +239,10 @@
 	   (versions (mapcar (function (lambda (name)
 					 (string-to-int (substring name (length base)))))
 			     files)))
-      (setq emacs-version (format "%s.%d"
-				  emacs-version
-				  (if versions
-				      (1+ (apply 'max versions))
-				    1)))))
+      ;; `emacs-version' is a constant, so we shouldn't change it with `setq'.
+      (defconst emacs-version
+	(format "%s.%d"
+		emacs-version (if versions (1+ (apply 'max versions)) 1)))))
 
 ;; Note: all compiled Lisp files loaded above this point
 ;; must be among the ones parsed by make-docfile
@@ -189,23 +265,71 @@
 	    (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))
+;; We don't use this fns-*.el file.  Instead we keep the data in PURE space.
+;; Make sure that the spine of the list is not in pure space because it can
+;; be destructively mutated in lread.c:build_load_history.
+(setq load-history (mapcar 'purecopy load-history))
+(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 (null (garbage-collect))
+    (setq pure-space-overflow t))
+
+(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))
@@ -214,7 +338,7 @@
 	  (setq name (concat (downcase (substring name 0 (match-beginning 0)))
 			     "-"
 			     (substring name (match-end 0)))))
-	(if (eq system-type 'ms-dos)
+	(if (memq system-type '(ms-dos windows-nt cygwin))
 	    (message "Dumping under the name emacs")
 	  (message "Dumping under names emacs and %s" name)))
       (condition-case ()
@@ -223,11 +347,11 @@
       ;; 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.
-      (if (not (memq system-type '(ms-dos windows-nt)))
+      (if (not (memq system-type '(ms-dos windows-nt cygwin)))
 	  (let ((name (concat "emacs-" emacs-version)))
 	    (while (string-match "[^-+_.a-zA-Z0-9]+" name)
 	      (setq name (concat (downcase (substring name 0 (match-beginning 0)))
@@ -241,13 +365,19 @@
 
 ;; 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)
+
+
+;;; Local Variables:
+;;; no-byte-compile: t
+;;; no-update-autoloads: t
+;;; End:
 
+;;; arch-tag: 121e1dd4-36e1-45ac-860e-239f577a6335
 ;;; loadup.el ends here