(www-format-encode-string): Display &{G-|g2-|R-}RUI6-hhhh;.

diff --git a/cwiki-common.el b/cwiki-common.el
index a720089..91eaa9f 100644 (file)
--- a/cwiki-common.el
+++ b/cwiki-common.el
@@ -1138,8 +1138,8 @@ style=\"%s\">"
             t 'literal))
 
          (goto-char (point-min))
-         (while (re-search-forward "&RUI6-\\([0-9A-F]+\\);" nil t)
-           (setq code (string-to-int (match-string 1) 16))
+         (while (re-search-forward "&\\(G-\\|g2-\\|R-\\)?RUI6-\\([0-9A-F]+\\);" nil t)
+           (setq code (string-to-int (match-string 2) 16))
            (replace-match
             (format "<img alt=\"RUI6-%04X\" src=\"%s?char=RUI6-%04X\"
 style=\"vertical-align:middle\">"