X-Git-Url: http://git.hcoop.net/bpt/emacs.git/blobdiff_plain/b0c654c03d12d2a1b5657bb6004ce2b4e55b7f0d..63e9aa8ee8daa065664f97a03b93387b3f39c9f5:/lisp/loadup.el

diff --git a/lisp/loadup.el b/lisp/loadup.el
index c450f74ed5..f3a793b252 100644
--- a/lisp/loadup.el
+++ b/lisp/loadup.el
@@ -34,20 +34,22 @@
 	(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)))
+    (let ((dir (car load-path)))
       ;; We'll probably overflow the pure space.
       (setq purify-flag nil)
-      (setq load-path (list path
-			    (expand-file-name "emacs-lisp" path)
-			    (expand-file-name "language" path)
-			    (expand-file-name "international" path)))))
+      (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*")
+(set-buffer "*scratch*")
+(setq buffer-undo-list t)
 
-(load "byte-run")
+(load "emacs-lisp/byte-run")
 (load "emacs-lisp/backquote")
 (load "subr")
 
@@ -56,7 +58,7 @@
 
 (load "widget")
 (load "custom")
-(load "map-ynp")
+(load "emacs-lisp/map-ynp")
 (load "env")
 (load "cus-start")
 (load "international/mule")
@@ -64,7 +66,6 @@
 (load "format")
 (load "bindings")
 (setq load-source-file-function 'load-with-code-conversion)
-(load "simple")
 (load "files")
 
 (load "cus-face")
@@ -75,6 +76,7 @@
 (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")
 
@@ -83,6 +85,7 @@
 (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))
@@ -97,7 +100,10 @@
 (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")
@@ -117,7 +123,6 @@
 (load "language/georgian")
 
 (load "international/ucs-tables")
-(ucs-unify-8859 'encode-only)
 
 (update-coding-systems-internal)
 
@@ -136,7 +141,7 @@
       (and (boundp 'x-toolkit-scroll-bars)
 	   (load "scroll-bar"))
       (load "select")))
-(load "timer")
+(load "emacs-lisp/timer")
 (load "isearch")
 
 (message "%s" (garbage-collect))
@@ -182,11 +187,13 @@
       (load "ls-lisp")))
 (if (fboundp 'atan)	; preload some constants and
     (progn		; floating pt. functions if we have float support.
-      (load "float-sup")))
+      (load "emacs-lisp/float-sup")))
 (message "%s" (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
@@ -298,6 +305,9 @@
 ;;; At this point, we're ready to resume undo recording for scratch.
 (buffer-enable-undo "*scratch*")
 
+(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)
@@ -310,7 +320,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 ()
@@ -323,7 +333,7 @@
       (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)))
@@ -350,4 +360,6 @@
 ;;; no-byte-compile: t
 ;;; no-update-autoloads: t
 ;;; End:
+
+;;; arch-tag: 121e1dd4-36e1-45ac-860e-239f577a6335
 ;;; loadup.el ends here