Use utf-translate-cjk-substitutable-p.

4 files changed, 14 insertions, 14 deletions

diff --git a/lisp/international/subst-big5.el b/lisp/international/subst-big5.el
index f2004b07544..9a17974ab01 100644
--- 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 dba26c9bd5c..446420490c5 100644
--- 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 edd01c0a0b3..8de2478d235 100644
--- 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 9f4b329b675..3cc339bbf8b 100644
--- 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 ?¢´)