projects / chise / est.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: f331f4e)
(www-edit-display-char-desc): Expect `uri-char' not to be decoded by
authorMORIOKA Tomohiko <tomo@kanji.zinbun.kyoto-u.ac.jp>
Wed, 17 Mar 2010 19:30:30 +0000 (04:30 +0900)
committerMORIOKA Tomohiko <tomo@kanji.zinbun.kyoto-u.ac.jp>
Wed, 17 Mar 2010 19:30:30 +0000 (04:30 +0900)
`decode-uri-string'.
(www-batch-edit): Don't use `decode-uri-string' for value of `char'.

cwiki-edit.el patch | blob | history

diff --git a/cwiki-edit.el b/cwiki-edit.el
index 7ceb3ed..b02679b 100644 (file)
--- a/cwiki-edit.el
+++ b/cwiki-edit.el
@@ -65,7 +65,9 @@ size=\"30\" maxlength=\"30\" value=\"%s\">
        (format "<head>
 <title>CHISE-wiki character: %s</title>
 </head>\n"
-              (www-format-encode-string uri-char 'without-tags)))
+              (encode-coding-string
+               (decode-uri-string uri-char 'utf-8-mcs-er)
+               'utf-8-mcs-er)))
       (princ "<body>\n")
       (princ
        (format "<h1>%s</h1>\n"
@@ -76,7 +78,7 @@ size=\"30\" maxlength=\"30\" value=\"%s\">
        (format "<p>(char : <input type=\"text\" name=\"char\"
 size=\"30\" maxlength=\"30\" value=\"%s\">)</p>
 "
-               uri-char)
+               (decode-uri-string uri-char 'utf-8-mcs-er))
        'utf-8-mcs-er))
       (setq char-spec (char-attribute-alist char))
       (if (string-match "\\*" (setq str (symbol-name feature-name)))
@@ -156,7 +158,7 @@ size=\"30\" maxlength=\"30\" value=\"%s\"></h1>\n"
       (format "<p>(<input type=\"text\" name=\"char\"
 size=\"30\" maxlength=\"30\" value=\"%s\">に限\u5B9Aしない)
 "
-             uri-char)
+             (decode-uri-string uri-char 'utf-8-mcs-er))
       'utf-8-mcs-er))
     (princ "<p>")
     (if (eq property-name 'name)
@@ -234,7 +236,7 @@ size=\"30\" maxlength=\"30\" value=\"%s\">に限\u5B9Aしない)
        (setq ret (car target))
        (cond ((eq (car ret) 'char)
               (www-edit-display-char-desc
-               (decode-uri-string (cdr ret) 'utf-8-mcs-er)
+                (cdr ret) ; (decode-uri-string (cdr ret) 'utf-8-mcs-er)
                (decode-uri-string (cdr (assq 'feature target))
                                   'utf-8-mcs-er)
                lang
@@ -247,8 +249,10 @@ size=\"30\" maxlength=\"30\" value=\"%s\">に限\u5B9Aしない)
                (decode-uri-string (cdr (assq 'property target))
                                   'utf-8-mcs-er)
                lang
-               (decode-uri-string (cdr (assq 'char target))
-                                  'utf-8-mcs-er))
+               (cdr (assq 'char target))
+                ;; (decode-uri-string (cdr (assq 'char target))
+                ;;                    'utf-8-mcs-er)
+               )
               ))
        (www-html-display-paragraph
         (format "%S" target))