Use utf-translate-cjk-substitutable-p.

diff --git a/lisp/international/subst-big5.el b/lisp/international/subst-big5.el
index f2004b07544486fe6bcab6eacf61a19e50805db7..9a17974ab01a8173dffefee248557b0b5b7a1546 100644 (file)
--- a/lisp/international/subst-big5.el
+++ b/lisp/international/subst-big5.el
@@ -32,9 +32,9 @@
  (lambda (pair)
    (let ((unicode (car pair))
         (char (cadr pair)))
-     (if (or (and (>= unicode #x2e80) (<= unicode #xd7a3))
-            (and (>= unicode #xff00) (<= unicode #xffef)))
-        (puthash unicode  char ucs-unicode-to-mule-cjk))
+     ;; exclude non-supporting components from decode table
+     (if (utf-translate-cjk-substitutable-p unicode)
+        (puthash unicode char ucs-unicode-to-mule-cjk))
      (puthash char unicode ucs-mule-cjk-to-unicode)))
  '((#xa7 ?¡±)
    (#xaf ?¡Â)

diff --git a/lisp/international/subst-gb2312.el b/lisp/international/subst-gb2312.el
index dba26c9bd5caa0187021e8119a9eed2c62bedeb1..446420490c579d4680ba061e2b3cea5dfe4c8138 100644 (file)
--- a/lisp/international/subst-gb2312.el
+++ b/lisp/international/subst-gb2312.el
@@ -32,9 +32,9 @@
  (lambda (pair)
    (let ((unicode (car pair))
         (char (cadr pair)))
-     (if (or (and (>= unicode #x2e80) (<= unicode #xd7a3))
-            (and (>= unicode #xff00) (<= unicode #xffef)))
-        (puthash unicode  char ucs-unicode-to-mule-cjk))
+     ;; exclude non-supporting components from decode table
+     (if (utf-translate-cjk-substitutable-p unicode)
+        (puthash unicode char ucs-unicode-to-mule-cjk))
      (puthash char unicode ucs-mule-cjk-to-unicode)))
  '((#xa4 ?¡è)
    (#xa7 ?¡ì)

diff --git a/lisp/international/subst-jis.el b/lisp/international/subst-jis.el
index edd01c0a0b378de89c1f732568d9f71b2e8b4282..8de2478d235c01c6cebab229347706a5fca2d5eb 100644 (file)
--- a/lisp/international/subst-jis.el
+++ b/lisp/international/subst-jis.el
@@ -45,11 +45,11 @@
 (mapc
  (lambda (pair)
    (let ((unicode (car pair))
-        (char (cadr pair)))
-     ;; exclude non-CJK components from decode table
-     (if (or (and (>= unicode #x2e80) (<= unicode #xd7a3))
-            (and (>= unicode #xff00) (<= unicode #xffef)))
-        (puthash unicode  char ucs-unicode-to-mule-cjk))
+        (char (cadr pair))
+        (tail utf-translate-cjk-unicode-range))
+     ;; exclude non-supporting components from decode table
+     (if (utf-translate-cjk-substitutable-p unicode)
+        (puthash unicode char ucs-unicode-to-mule-cjk))
      (puthash char unicode ucs-mule-cjk-to-unicode)))
  '(
    ;; jisx0208

diff --git a/lisp/international/subst-ksc.el b/lisp/international/subst-ksc.el
index 9f4b329b67558ec0941b7f44e81658fc6ee358ca..3cc339bbf8b906cad0016254f61a24f170e3ec6f 100644 (file)
--- a/lisp/international/subst-ksc.el
+++ b/lisp/international/subst-ksc.el
@@ -31,9 +31,9 @@
  (lambda (pair)
    (let ((unicode (car pair))
         (char (cadr pair)))
-     (if (or (and (>= unicode #x2e80) (<= unicode #xd7a3))
-            (and (>= unicode #xff00) (<= unicode #xffef)))
-        (puthash unicode  char ucs-unicode-to-mule-cjk))
+     ;; exclude non-supporting components from decode table
+     (if (utf-translate-cjk-substitutable-p unicode)
+        (puthash unicode char ucs-unicode-to-mule-cjk))
      (puthash char unicode ucs-mule-cjk-to-unicode)))
  '((#xa1 ?¢®)
    (#xa4 ?¢´)