From: MORIOKA Tomohiko <tomo@kanji.zinbun.kyoto-u.ac.jp>
Date: Thu, 18 Mar 2010 12:20:08 +0000 (+0900)
Subject: (www-edit-display-char-feature-default): Use `www-char-feature'
X-Git-Url: http://git.chise.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=bea5b1cd871de7aab89cc41b1b3d3e3281f927c0;p=chise%2Fest.git

(www-edit-display-char-feature-default): Use `www-char-feature'
instead of `char-feature'.
(www-edit-display-char-feature-as-ucs): Likewise.
(www-edit-display-char-desc): Likewise; replace value of char-spec
with value of `www-char-feature'.
---

diff --git a/cwiki-edit.el b/cwiki-edit.el
index dc633c9..7e4d6ae 100644
--- a/cwiki-edit.el
+++ b/cwiki-edit.el
@@ -7,7 +7,7 @@
 (defun www-edit-display-char-feature-default (char feature-name &optional value
 					      lang)
   (unless value
-    (setq value (char-feature char feature-name)))
+    (setq value (www-char-feature char feature-name)))
   (www-html-display-paragraph
    (format "[[%s|%s?feature=%s]] : %s [[[edit|edit.cgi?char=%s&feature=%s]]]"
 	   (www-format-feature-name feature-name lang)
@@ -20,7 +20,7 @@
 
 (defun www-edit-display-char-feature-as-ucs (char feature-name &optional value)
   (unless value
-    (setq value (char-feature char feature-name)))
+    (setq value (www-char-feature char feature-name)))
   (www-html-display-paragraph
    (format "= [[U+%s|http://www.unicode.org/cgi-bin/GetUnihanData.pl?codepoint=%s]] (%d)"
 	   (www-format-value-as-HEX value)
@@ -108,7 +108,9 @@ size=\"30\" maxlength=\"30\" value=\"%s\">
 		       "0x"
 		     "")
 		   format
-		   (www-format-value (cdr cell) feature-name
+		   (www-format-value (www-char-feature char (car cell))
+				     ;;(cdr cell)
+				     feature-name
 				     format 'without-tags)))
 	  )
 	 (t
@@ -123,7 +125,7 @@ size=\"30\" maxlength=\"30\" value=\"%s\">
 	    (princ "<ul>\n")
 	    (princ "<li>")
 	    (www-edit-display-input-box feature-name
-					(char-feature char feature-name)
+					(www-char-feature char feature-name)
 					format)
 	    (princ "</li>")
 	    (princ "</ul>"))