Rename ido-max-prompt-width to ido-max-file-prompt-width for consistency.

[gnu-emacs] / lisp / loadup.el

diff --git a/lisp/loadup.el b/lisp/loadup.el
index e0cb78ef015a6095e85731d31d521c0084c5c193..0d4bab0e26cbc59428ed8004bf460bbc30b63028 100644 (file)
--- a/lisp/loadup.el
+++ b/lisp/loadup.el
@@ -64,7 +64,6 @@
 (load "format")
 (load "bindings")
 (setq load-source-file-function 'load-with-code-conversion)
-(load "simple")
 (load "files")
 
 (load "cus-face")
@@ -75,6 +74,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")
 
@@ -82,8 +82,9 @@
 ;; multilingual text.
 (load "international/mule-cmds")
 (load "case-table")
-(load "international/characters")
 (load "international/utf-8")
+(load "international/utf-16")
+(load "international/characters")
 
 (let ((set-case-syntax-set-multibyte t))
   (load "international/latin-1")
@@ -117,7 +118,6 @@
 (load "language/georgian")
 
 (load "international/ucs-tables")
-(ucs-unify-8859 'encode-only)
 
 (update-coding-systems-internal)
 
@@ -125,6 +125,7 @@
 (load "window")
 (load "frame")
 (load "term/tty-colors")
+(load "font-core")
 
 (if (fboundp 'frame-face-alist)
     (progn