summaryrefslogtreecommitdiff
path: root/lisp/loadup.el
diff options
context:
space:
mode:
Diffstat (limited to 'lisp/loadup.el')
-rw-r--r--lisp/loadup.el21
1 files changed, 7 insertions, 14 deletions
diff --git a/lisp/loadup.el b/lisp/loadup.el
index 6a8d5b263eb..affaf03b92d 100644
--- a/lisp/loadup.el
+++ b/lisp/loadup.el
@@ -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)))
@@ -86,18 +88,12 @@
;; 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")
@@ -124,10 +120,6 @@
(load "language/utf-8-lang")
(load "language/georgian")
-(load "international/ucs-tables")
-
-(update-coding-systems-internal)
-
(load "indent")
(load "window")
(load "frame")
@@ -319,6 +311,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.