(www-parse-string-as-space-separated-char-list): Use

`www-uri-decode-object' instead of `www-uri-decode-char'.
(www-parse-string-as-space-separated-ids): Likewise.
(www-set-display-char-desc): Likewise; use `www-get-feature-value'
instead of `www-char-feature'.

diff --git a/cwiki-set.el b/cwiki-set.el
index dd2f309..ea7c732 100644 (file)
--- a/cwiki-set.el
+++ b/cwiki-set.el
@@ -100,7 +100,7 @@
 (defun www-parse-string-as-space-separated-char-list (string)
   (let (dest char)
     (dolist (unit (split-string string "\\+"))
-      (if (setq char (www-uri-decode-char unit))
+      (if (setq char (www-uri-decode-object 'character unit))
          (setq dest (cons char dest))))
     (nreverse dest)))
 
@@ -110,7 +110,7 @@
     (let (char)
       (mapconcat
        (lambda (unit)
-        (if (setq char (www-uri-decode-char unit))
+        (if (setq char (www-uri-decode-object 'character unit))
             (char-to-string char)
           unit))
        (split-string string "\\+")
@@ -191,7 +191,7 @@
     (setq feature (intern feature)))
   (when (stringp format)
     (setq format (intern format)))
-  (let ((char (www-uri-decode-char uri-char))
+  (let ((char (www-uri-decode-object 'character uri-char))
        latest-feature
        logical-feature displayed-features
        ret)
@@ -214,13 +214,13 @@
       (setq latest-feature
            (char-feature-name-at-domain feature '$rev=latest))
       (if value
-         (if (equal (www-char-feature char feature) value)
+         (if (equal (www-get-feature-value char feature) value)
              (www-html-display-paragraph
               "Feature-value is not changed.")
             ;; (www-html-display-paragraph
             ;;  (format "New feature-value = %S is different from old value %S"
             ;;          value
-            ;;          (www-char-feature char feature)))
+            ;;          (www-get-feature-value char feature)))
            (put-char-attribute char latest-feature value)
            (save-char-attribute-table latest-feature)
            (setq ret (char-feature-property '$object 'additional-features))
@@ -347,7 +347,7 @@
     (princ "<hr />")
     (www-html-display-paragraph
      (format "「[[%c|%s?char=%s]]」に\u623Bる"
-            (www-uri-decode-char uri-char)
+            (www-uri-decode-object 'character uri-char)
             chise-wiki-view-url
             uri-char))
     ))