(www-display-char-desc): Use `char-feature-name-sans-versions'.

diff --git a/cwiki-view.el b/cwiki-view.el
index ae8bb22..9e0a10c 100644 (file)
--- a/cwiki-view.el
+++ b/cwiki-view.el
@@ -36,7 +36,7 @@
   (unless level
     (setq level 1))
   (let ((char (www-uri-decode-char uri-char))
-       feature-name logical-feature displayed-features)
+       logical-feature displayed-features)
     (when (characterp char)
       (when (= (length uri-char) 1)
        (setq uri-char (www-uri-encode-char char)))
@@ -58,11 +58,7 @@
       (dolist (cell (sort (char-attribute-alist char)
                          (lambda (a b)
                            (char-attribute-name< (car a)(car b)))))
-       (setq feature-name (symbol-name (car cell)))
-       (setq logical-feature
-             (if (string-match "[@/]\\$rev=latest$" feature-name)
-                 (intern (substring feature-name 0 (match-beginning 0)))
-               (car cell)))
+       (setq logical-feature (char-feature-name-sans-versions (car cell)))
        (unless (memq logical-feature displayed-features)
          (push logical-feature displayed-features)
          (princ
@@ -78,7 +74,7 @@
            logical-feature ; (car cell)
            lang uri-char))
          (princ
-          (format " <a href=\"%s?char=%s&feature=%s\"
+          (format " <a href=\"%s?char=%s&feature=%s&format=wiki-text\"
 ><input type=\"submit\" value=\"note\" /></a>"
                   chise-wiki-edit-url
                   (www-format-encode-string uri-char)