aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorEli Zaretskii2001-02-07 05:48:08 +0000
committerEli Zaretskii2001-02-07 05:48:08 +0000
commit6f676109909192891ca91d815010a82e8a758e50 (patch)
treef6f4d5a18cefb86a00277f76d5b74924385ef802
parent1399fef0f0e18f1a6a309b1b345f907866a96e0a (diff)
downloademacs-6f676109909192891ca91d815010a82e8a758e50.tar.gz
emacs-6f676109909192891ca91d815010a82e8a758e50.zip
Revert last change.
-rw-r--r--lisp/ChangeLog4
-rw-r--r--lisp/loadup.el2
2 files changed, 5 insertions, 1 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 74d86c108f8..d53109a90e9 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,7 @@
12001-02-07 Eli Zaretskii <eliz@is.elta.co.il>
2
3 * loadup.el: Revert last change.
4
12001-02-07 Kenichi Handa <handa@etl.go.jp> 52001-02-07 Kenichi Handa <handa@etl.go.jp>
2 6
3 * international/mule.el (transform-make-coding-system-args): Make 7 * international/mule.el (transform-make-coding-system-args): Make
diff --git a/lisp/loadup.el b/lisp/loadup.el
index 507f3d55e40..6291a9b803f 100644
--- a/lisp/loadup.el
+++ b/lisp/loadup.el
@@ -76,7 +76,6 @@
76(load "international/mule-cmds") 76(load "international/mule-cmds")
77(load "case-table") 77(load "case-table")
78(load "international/characters") 78(load "international/characters")
79(load "international/ccl")
80(load "international/utf-8") 79(load "international/utf-8")
81 80
82(let ((set-case-syntax-set-multibyte t)) 81(let ((set-case-syntax-set-multibyte t))
@@ -159,6 +158,7 @@
159 (load "dos-w32") 158 (load "dos-w32")
160 (load "dos-fns") 159 (load "dos-fns")
161 (load "dos-vars") 160 (load "dos-vars")
161 (load "international/ccl") ; codepage.el uses CCL en/decoder
162 (load "international/codepage") ; internal.el uses cpNNN coding systems 162 (load "international/codepage") ; internal.el uses cpNNN coding systems
163 (load "disp-table"))) ; needed to setup ibm-pc char set, see internal.el 163 (load "disp-table"))) ; needed to setup ibm-pc char set, see internal.el
164(if (eq system-type 'macos) 164(if (eq system-type 'macos)