(M-44237): Unify JC3-6DBE.

[chise/xemacs-chise.git.1] / lisp / utf-2000 / ideograph-util.el

diff --git a/lisp/utf-2000/ideograph-util.el b/lisp/utf-2000/ideograph-util.el
index adc7564..c56844a 100644 (file)
--- a/lisp/utf-2000/ideograph-util.el
+++ b/lisp/utf-2000/ideograph-util.el
@@ -32,7 +32,7 @@
 (defun char-ideographic-radical (char &optional radical)
   (let (ret)
     (or (catch 'tag
-         (dolist (domain '(ucs daikanwa cns))
+         (dolist (domain char-db-feature-domains)
            (if (and (setq ret (get-char-attribute
                                char
                                (intern
@@ -88,20 +88,22 @@
 (defun char-ideographic-strokes (char &optional radical)
   (let (ret)
     (or (catch 'tag
-         (dolist (domain '(ucs daikanwa cns))
-           (if (and (setq ret (get-char-attribute
+         (dolist (domain char-db-feature-domains)
+           (if (and (setq ret (or (get-char-attribute
+                                   char
+                                   (intern
+                                    (format "%s@%s"
+                                            'ideographic-radical domain)))
+                                  (get-char-attribute
+                                   char 'ideographic-radical)))
+                    (or (eq ret radical)
+                        (null radical))
+                    (setq ret (get-char-attribute
                                char
                                (intern
                                 (format "%s@%s"
-                                        'ideographic-radical domain))))
-                    (or (eq ret radical)
-                        (null radical)))
-               (throw 'tag
-                      (get-char-attribute
-                       char
-                       (intern
-                        (format "%s@%s"
-                                'ideographic-strokes domain)))))))
+                                        'ideographic-strokes domain)))))
+               (throw 'tag ret))))
        (catch 'tag
          (dolist (cell (get-char-attribute char 'ideographic-))
            (if (and (setq ret (plist-get cell :radical))
@@ -127,7 +129,7 @@
 (defun update-ideograph-radical-table ()
   (interactive)
   (let (ret radical script)
-    (dolist (domain '(ucs daikanwa cns))
+    (dolist (domain char-db-feature-domains)
       (map-char-attribute
        (lambda (char radical)
         (when (and radical