X-Git-Url: https://git.hcoop.net/bpt/emacs.git/blobdiff_plain/d4e9f06737f102f454c400f2918e6fc228871350..739d627a477191703f57ca4cfbd1bf8dc25625f9:/lisp/loadup.el

diff --git a/lisp/loadup.el b/lisp/loadup.el
index 1b96afd548..b4032e49e4 100644
--- 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, 2006, 2007 Free Software Foundation, Inc.
+;;   2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc.
 
 ;; Maintainer: FSF
 ;; Keywords: internal
@@ -33,6 +33,8 @@
 ;; get autoloaded when bootstrapping
 (if (or (equal (nth 3 command-line-args) "bootstrap")
 	(equal (nth 4 command-line-args) "bootstrap")
+	(equal (nth 3 command-line-args) "unidata-gen.el")
+	(equal (nth 4 command-line-args) "unidata-gen-files")
 	;; in case CANNOT_DUMP
 	(equal (nth 0 command-line-args) "../src/bootstrap-emacs"))
     (let ((dir (car load-path)))
@@ -89,26 +91,17 @@
 ;; multilingual text.
 (load "international/mule-cmds")
 (load "case-table")
-(load "international/utf-8")
-(load "international/utf-16")
 (load "international/characters")
+(load "composite")
+;; This file doesn't exist when building Emacs from CVS.  It is
+;; generated just after temacs is build.
+(load "international/charprop.el" t)
 
-(let ((set-case-syntax-set-multibyte t))
-  (load "international/latin-1")
-  (load "international/latin-2")
-  (load "international/latin-3")
-  (load "international/latin-4")
-  (load "international/latin-5")
-  (load "international/latin-8")
-  (load "international/latin-9"))
 ;; Load language-specific files.
 (load "language/chinese")
 (load "language/cyrillic")
 (load "language/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/sinhala")
 (load "language/english")
 (load "language/ethiopic")
 (load "language/european")
@@ -120,21 +113,20 @@
 (load "language/japanese")
 (load "language/korean")
 (load "language/lao")
+(load "language/tai-viet")
 (load "language/thai")
 (load "language/tibetan")
 (load "language/vietnamese")
 (load "language/misc-lang")
 (load "language/utf-8-lang")
 (load "language/georgian")
-
-(load "international/ucs-tables")
-
-(update-coding-systems-internal)
+(load "language/khmer")
+(load "language/burmese")
+(load "language/cham")
 
 (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'
@@ -161,6 +153,7 @@
 (load "textmodes/page")
 (load "register")
 (load "textmodes/paragraphs")
+(load "abbrev")                      ;lisp-mode.el uses define-abbrev-table.
 (load "emacs-lisp/lisp-mode")
 (load "textmodes/text-mode")
 (load "textmodes/fill")
@@ -170,7 +163,6 @@
 (if (eq system-type 'vax-vms)
     (progn
       (load "vmsproc")))
-(load "abbrev")
 (load "buff-menu")
 
 (if (fboundp 'x-create-frame)
@@ -193,13 +185,11 @@
       (load "vms-patch")))
 (if (eq system-type 'windows-nt)
     (progn
-      (load "international/ccl")
-      (load "international/code-pages")
+      (load "w32-vars")
       (load "term/w32-win")
       (load "ls-lisp")
       (load "disp-table") ; needed to setup ibm-pc char set, see internal.el
       (load "dos-w32")
-      (load "w32-vars")
       (load "w32-fns")))
 (if (eq system-type 'ms-dos)
     (progn
@@ -331,6 +321,7 @@
 	(equal (nth 4 command-line-args) "bootstrap"))
     (setcdr load-path nil))
 
+(clear-charset-maps)
 (garbage-collect)
 
 ;;; At this point, we're ready to resume undo recording for scratch.