From: tomo <tomo>
Date: Sun, 7 Nov 2004 02:03:32 +0000 (+0000)
Subject: (insert-char-attributes): Sort domains not found in
X-Git-Tag: r21-4-15-u2km-0_21-32-a~2^2~70
X-Git-Url: http://git.chise.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=76f0bf50e43a6c098f0d18c2e1abfa676448e307;p=chise%2Fxemacs-chise.git

(insert-char-attributes): Sort domains not found in
`char-db-feature-domains'.
---

diff --git a/lisp/utf-2000/char-db-util.el b/lisp/utf-2000/char-db-util.el
index f427369..73a4f5a 100644
--- a/lisp/utf-2000/char-db-util.el
+++ b/lisp/utf-2000/char-db-util.el
@@ -621,19 +621,18 @@
       )
     (let (key)
       (dolist (domain
-	       ;; char-db-feature-domains
-	       (let* ((dest char-db-feature-domains)
-		      (dlast (last dest))
-		      domain)
-		 (dolist (feature (char-attribute-list))
-		   (setq feature (symbol-name feature))
-		   (when (string-match
-			  "\\(radical\\|strokes\\)@\\([^@*]+\\)\\(\\*\\|$\\)"
-			  feature)
-		     (setq domain (intern (match-string 2 feature)))
+	       (append
+		char-db-feature-domains
+		(let (dest domain)
+		  (dolist (feature (char-attribute-list))
+		    (setq feature (symbol-name feature))
+		    (when (string-match
+			   "\\(radical\\|strokes\\)@\\([^@*]+\\)\\(\\*\\|$\\)"
+			   feature)
+		      (setq domain (intern (match-string 2 feature)))
 		     (unless (memq domain dest)
-		       (setcdr dlast (setq dlast (list domain))))))
-		 dest))
+		       (setq dest (cons domain dest)))))
+		  (sort dest #'string<))))
 	(setq key (intern (format "%s@%s" 'ideographic-radical domain)))
 	(when (and (memq key attributes)
 		   (setq value (get-char-attribute char key)))