Load ccl before utf-8; don't load ccl in the ms-dos

specific case.

diff --git a/lisp/loadup.el b/lisp/loadup.el
index 1a6aafb6aadddd7d156bd8f7638e26c86e95dd3f..507f3d55e401ffb17c11a67152dbf9318b5c60ca 100644 (file)
--- a/lisp/loadup.el
+++ b/lisp/loadup.el
@@ -76,6 +76,7 @@
 (load "international/mule-cmds")
 (load "case-table")
 (load "international/characters")
+(load "international/ccl")
 (load "international/utf-8")
 
 (let ((set-case-syntax-set-multibyte t))
@@ -158,7 +159,6 @@
       (load "dos-w32")
       (load "dos-fns")
       (load "dos-vars")
-      (load "international/ccl") ; for cpNNN coding systems in codepage.el
       (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)