(ucs-tables): Don't require when

compiling.
(ucs-mule-8859-to-mule-unicode): Add dummy definition.

diff --git a/lisp/international/utf-8.el b/lisp/international/utf-8.el
index 5488e8a7c2da423e165d081d464c19cdb31cf051..3346084889067c456bdd5f2cff5aa634d507c4e7 100644 (file)
--- a/lisp/international/utf-8.el
+++ b/lisp/international/utf-8.el
@@ -55,8 +55,6 @@
 
 ;;; Code:
 
-(eval-when-compile (require 'ucs-tables))
-
 (define-ccl-program ccl-decode-mule-utf-8
   ;;
   ;;        charset         | bytes in utf-8 | bytes in emacs
@@ -273,6 +271,10 @@ Only characters from the charsets ascii, eight-bit-control,
 latin-iso8859-1 and mule-unicode-* are recognized.  Others are encoded
 as U+FFFD.")
 
+;; Dummy definition needed by the CCL program.  The real data are
+;; loaded on demand.
+(define-translation-table 'ucs-mule-8859-to-mule-unicode)
+
 (make-coding-system
  'mule-utf-8 4 ?u
  "UTF-8 encoding for Emacs-supported Unicode characters.
@@ -313,7 +315,8 @@ lower-casing commands won't work with them."
     mule-unicode-2500-33ff
     mule-unicode-e000-ffff)
    (mime-charset . utf-8)
-   ;; Kluge to ensure the translation table is loaded.
+   (valid-codes (0 . 255))
+   ;; Kluge to get the real translation table loaded.
    (pre-write-conversion . internal-require-ucs-tables)))
 
 (defun internal-require-ucs-tables (from to)