From: MORIOKA Tomohiko Date: Wed, 17 Mar 2010 19:30:30 +0000 (+0900) Subject: (www-edit-display-char-desc): Expect `uri-char' not to be decoded by X-Git-Url: http://git.chise.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=13d18a4b1a1f5de18853dab21fea91e6c7de7cc9;p=chise%2Fest.git (www-edit-display-char-desc): Expect `uri-char' not to be decoded by `decode-uri-string'. (www-batch-edit): Don't use `decode-uri-string' for value of `char'. --- diff --git a/cwiki-edit.el b/cwiki-edit.el index 7ceb3ed..b02679b 100644 --- a/cwiki-edit.el +++ b/cwiki-edit.el @@ -65,7 +65,9 @@ size=\"30\" maxlength=\"30\" value=\"%s\"> (format " CHISE-wiki character: %s \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 "\n") (princ (format "

%s

\n" @@ -76,7 +78,7 @@ size=\"30\" maxlength=\"30\" value=\"%s\"> (format "

(char : )

" - 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\">\n" (format "

(に限\u5B9Aしない) " - uri-char) + (decode-uri-string uri-char 'utf-8-mcs-er)) 'utf-8-mcs-er)) (princ "

") (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))