From: Dave Love <fx@gnu.org>
Date: Sun, 8 Dec 2002 19:13:04 +0000 (+0000)
Subject: (mule-diag): Move where it's
X-Git-Tag: ttn-vms-21-2-B4~12084
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=63dc56a17692ff2f6f30831dfacfff29a041135d;p=emacs.git

(mule-diag): Move where it's
required.
---

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index ed2a7af64a6..96526c9fc23 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,5 +1,8 @@
 2002-12-08  Dave Love  <fx@gnu.org>
 
+	* international/code-pages.el (mule-diag): Move where it's
+	required.
+
 	* international/ucs-tables.el: Add latin-jisx0201 characters.  Fix
 	translation-table-for-input for lao, thai, tibetan.
 
diff --git a/lisp/international/code-pages.el b/lisp/international/code-pages.el
index 33975a6eb2f..3049ae5863c 100644
--- a/lisp/international/code-pages.el
+++ b/lisp/international/code-pages.el
@@ -54,8 +54,6 @@
 
 ;;; Code:
 
-(require 'mule-diag)			; for non-iso-charset-alist
-
 (defun cp-make-translation-table (v)
   "Return a translation table made from 128-long vector V.
 V comprises characters encodable by mule-utf-8."
@@ -152,6 +150,11 @@ read/written by MS-DOS software, or for display on the MS-DOS terminal."
        cp (cp-charset-for-codepage cp) (cp-offset-for-codepage cp))))))
 )					; eval-after-load
 
+;; For `non-iso-charset-alist'.  Do this after redefining
+;; `cp-supported-codepages', which is called through loading
+;; mule-diag.
+(require 'mule-diag)
+
 ;; Macro to allow ccl compilation at byte-compile time, avoiding
 ;; loading ccl.
 ;;;###autoload