diff options
| author | Eli Zaretskii | 2001-01-26 10:16:41 +0000 |
|---|---|---|
| committer | Eli Zaretskii | 2001-01-26 10:16:41 +0000 |
| commit | 9b1adbd5a213c871622fee974894cd33f0babc63 (patch) | |
| tree | c085e9c798fe703488187065ea6261f1a5f0fc8f | |
| parent | d2906bf8fb65a86a55c390c4ff017b526fe51a56 (diff) | |
| download | emacs-9b1adbd5a213c871622fee974894cd33f0babc63.tar.gz emacs-9b1adbd5a213c871622fee974894cd33f0babc63.zip | |
(Top-level) [ms-dos]: Don't load international/ccl twice.
| -rw-r--r-- | lisp/ChangeLog | 5 | ||||
| -rw-r--r-- | lisp/loadup.el | 1 |
2 files changed, 5 insertions, 1 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog index 6281a3857bd..f83deaa51cc 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog | |||
| @@ -1,3 +1,8 @@ | |||
| 1 | 2001-01-26 Eli Zaretskii <eliz@is.elta.co.il> | ||
| 2 | |||
| 3 | * loadup.el (Top-level) [ms-dos]: Don't load international/ccl | ||
| 4 | twice. | ||
| 5 | |||
| 1 | 2001-01-26 Richard M. Stallman <rms@caffeine.ai.mit.edu> | 6 | 2001-01-26 Richard M. Stallman <rms@caffeine.ai.mit.edu> |
| 2 | 7 | ||
| 3 | * simple.el (next-line): Don't let `newline' expand abbrevs. | 8 | * simple.el (next-line): Don't let `newline' expand abbrevs. |
diff --git a/lisp/loadup.el b/lisp/loadup.el index 9fecd047287..507f3d55e40 100644 --- a/lisp/loadup.el +++ b/lisp/loadup.el | |||
| @@ -159,7 +159,6 @@ | |||
| 159 | (load "dos-w32") | 159 | (load "dos-w32") |
| 160 | (load "dos-fns") | 160 | (load "dos-fns") |
| 161 | (load "dos-vars") | 161 | (load "dos-vars") |
| 162 | (load "international/ccl") ; for cpNNN coding systems in codepage.el | ||
| 163 | (load "international/codepage") ; internal.el uses cpNNN coding systems | 162 | (load "international/codepage") ; internal.el uses cpNNN coding systems |
| 164 | (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 |
| 165 | (if (eq system-type 'macos) | 164 | (if (eq system-type 'macos) |