(www-format-encode-string): Check return value of

[chise/est.git] / cwiki-common.el

diff --git a/cwiki-common.el b/cwiki-common.el
index 91eaa9f..1f7e082 100644 (file)
--- a/cwiki-common.el
+++ b/cwiki-common.el
@@ -1086,7 +1086,7 @@ style=\"%s\">"
             t 'literal))
 
          (goto-char (point-min))
-         (while (re-search-forward "&\\(G-\\)?GT-K\\([0-9]+\\);" nil t)
+         (while (re-search-forward "&\\(A-\\|G-\\)?GT-K\\([0-9]+\\);" nil t)
            (setq code (string-to-int (match-string 2)))
            (replace-match
             (format "<img alt=\"GT-K%05d\" src=\"%s?char=GT-K%05d\"
@@ -1183,7 +1183,9 @@ style=\"vertical-align:middle\">"
                         (or (www-get-feature-value char '->subsumptive)
                             (www-get-feature-value char '->denotational)))
                   (progn
-                    (while (and variants
+                    (if (characterp variants)
+                        (setq variants (list variants)))
+                    (while (and variants
                                 (setq ret (www-format-encode-string
                                            (char-to-string (car variants))))
                                 (string-match "&MCS-\\([0-9A-F]+\\);" ret))