Merged from emacs@sv.gnu.org

[bpt/emacs.git] / lisp / loadup.el

diff --git a/lisp/loadup.el b/lisp/loadup.el
index e1d5e56..4cee6fd 100644 (file)
--- a/lisp/loadup.el
+++ b/lisp/loadup.el
@@ -1,7 +1,7 @@
 ;;; loadup.el --- load up standardly loaded Lisp files for Emacs
 
 ;; Copyright (C) 1985, 1986, 1992, 1994, 2001, 2002, 2003,
-;;   2004, 2005 Free Software Foundation, Inc.
+;;   2004, 2005, 2006 Free Software Foundation, Inc.
 
 ;; Maintainer: FSF
 ;; Keywords: internal
@@ -60,10 +60,10 @@
 (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 "env")
 (load "format")
 (load "bindings")
 (setq load-source-file-function 'load-with-code-conversion)
@@ -132,12 +132,16 @@
 (load "indent")
 (load "window")
 (load "frame")
+(load "termdev")
 (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 'frame-face-alist)
-    (progn
-      (load "facemenu")))
 (if (fboundp 'track-mouse)
     (progn
       (load "mouse")
@@ -146,6 +150,7 @@
       (load "select")))
 (load "emacs-lisp/timer")
 (load "isearch")
+(load "rfn-eshadow")
 
 (message "%s" (garbage-collect))
 (load "menu-bar")
@@ -165,7 +170,19 @@
       (load "vmsproc")))
 (load "abbrev")
 (load "buff-menu")
-(load "server") ; server-getenv is used throughout the terminal initialization code
+
+(if (fboundp 'x-create-frame)
+    (progn
+      (load "fringe")
+      (load "image")
+      (load "international/fontset")
+      (load "dnd")
+      (load "mwheel")
+      (load "tool-bar")
+      (load "x-dnd")
+      (load "term/x-win")))
+(message "%s" (garbage-collect))
+
 (if (eq system-type 'vax-vms)
     (progn
       (load "vms-patch")))
@@ -193,20 +210,11 @@
       (load "emacs-lisp/float-sup")))
 (message "%s" (garbage-collect))
 
-;; Load auxiliary settings for X displays if we support them.
-(when (fboundp 'x-create-frame)
-  (load "mouse")
-  (load "international/fontset")
-  (load "dnd")
-  (load "x-dnd")
-  (load "term/x-win"))
-
-(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