Initial revision.

[gnu-emacs] / lisp / loadup.el

diff --git a/lisp/loadup.el b/lisp/loadup.el
index 31a7cac8c9d494b40a2934ae2a3e06ee6dfd3ffc..09c73378da6f360b1f4db4babcb4d39a94c2e615 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
@@ -37,6 +37,7 @@
     (let ((path (car load-path)))
       (setq load-path (list path
                            (expand-file-name "emacs-lisp" path)
+                           (expand-file-name "language" path)
                            (expand-file-name "international" path)))))
 
 (message "Using load-path %s" load-path)
@@ -64,6 +65,8 @@
 (load "simple")
 (load "files")
 
+(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))
@@ -71,11 +74,13 @@
 (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")
@@ -105,20 +110,22 @@
 (load "language/tibetan")
 (load "language/vietnamese")
 (load "language/misc-lang")
+(load "language/utf-8-lang")
+(load "language/georgian")
 (update-coding-systems-internal)
 
 (load "indent")
 (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")
@@ -157,9 +164,12 @@
       (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 (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")))