Change indian-1-column charset to indian-glyph charset.

[gnu-emacs] / lisp / loadup.el

diff --git a/lisp/loadup.el b/lisp/loadup.el
index e0e53477e88e35b5d22c82939eed56dd8a4d6c7e..db5bcb9ea52216a17858b04a612090159fc5b82f 100644 (file)
--- 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
@@ -31,7 +31,9 @@
 ;; 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"))
+       (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)
@@ -50,7 +52,7 @@
 
 (load "widget")
 (load "custom")
-(autoload '\` "emacs-lisp/backquote" nil nil 'macro)
+(load "emacs-lisp/backquote")
 (load "map-ynp")
 (load "env")
 (load "cus-start")
@@ -60,13 +62,9 @@
 (load "bindings")
 (setq load-source-file-function 'load-with-code-conversion)
 (load "simple")
-(load "help")
 (load "files")
-;; Any Emacs Lisp source file (*.el) loaded here after can contain
-;; multilingual text.
-(load "international/mule-cmds")
-(load "case-table")
-(load "international/characters")
+
+(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.")
@@ -74,6 +72,15 @@
 (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.
+(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")
@@ -105,20 +112,20 @@
 (update-coding-systems-internal)
 
 (load "indent")
-(load "isearch")
 (load "window")
 (load "frame")
 (load "term/tty-colors")
-(load "faces")
+
 (if (fboundp 'frame-face-alist)
     (progn
       (load "facemenu")))
 (if (fboundp 'track-mouse)
     (progn
       (load "mouse")
-      (and (boundp 'x-toolkit-scroll-bars-p)
+      (and (boundp 'x-toolkit-scroll-bars)
           (load "scroll-bar"))
       (load "select")))
+(load "isearch")
 
 (message "%s" (garbage-collect))
 (load "menu-bar")
@@ -154,10 +161,13 @@
       (load "dos-w32")
       (load "dos-fns")
       (load "dos-vars")
-      (load "international/ccl") ; for cpNNN coding systems in codepage.el
+      (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")))
 (message "%s" (garbage-collect))
@@ -247,7 +257,7 @@
       (princ ")))\n" (current-buffer))
       (write-region (point-min) (point-max)
                    (expand-file-name
-                    (cond 
+                    (cond
                      ((eq system-type 'ms-dos)
                       "../lib-src/fns.el")
                      ((eq system-type 'windows-nt)
@@ -273,7 +283,7 @@
 (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))