Changes from arch/CVS synchronization

[gnu-emacs] / lisp / loadup.el

diff --git a/lisp/loadup.el b/lisp/loadup.el
index 5c33e02cbc74db4484f570b4fb528c4d4f70c95e..15f47440aedbf76c6172462e0c72ed4be16e94d4 100644 (file)
--- a/lisp/loadup.el
+++ b/lisp/loadup.el
@@ -34,21 +34,21 @@
        (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)
-                           (expand-file-name "textmodes" 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*")
 
-(load "byte-run")
+(load "emacs-lisp/byte-run")
 (load "emacs-lisp/backquote")
 (load "subr")
 
@@ -57,7 +57,7 @@
 
 (load "widget")
 (load "custom")
-(load "map-ynp")
+(load "emacs-lisp/map-ynp")
 (load "env")
 (load "cus-start")
 (load "international/mule")
@@ -99,7 +99,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")
@@ -137,7 +140,7 @@
       (and (boundp 'x-toolkit-scroll-bars)
           (load "scroll-bar"))
       (load "select")))
-(load "timer")
+(load "emacs-lisp/timer")
 (load "isearch")
 
 (message "%s" (garbage-collect))
@@ -183,7 +186,7 @@
       (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")
@@ -299,6 +302,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)
@@ -324,7 +330,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)))
@@ -351,4 +357,6 @@
 ;;; no-byte-compile: t
 ;;; no-update-autoloads: t
 ;;; End:
+
+;;; arch-tag: 121e1dd4-36e1-45ac-860e-239f577a6335
 ;;; loadup.el ends here