From f331f4e0bea2a62e9e030462c3072c1b1df37b66 Mon Sep 17 00:00:00 2001 From: MORIOKA Tomohiko Date: Thu, 18 Mar 2010 04:27:36 +0900 Subject: [PATCH] (www-display-char-desc): Expect `uri-char' to be encoded as %XX encoding; encode `uri-char' if it is a non-encoded character. (www-batch-view): Don't use `decode-uri-string' for value of `char'. --- cwiki-view.el | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/cwiki-view.el b/cwiki-view.el index 2f7721e..c30519d 100644 --- a/cwiki-view.el +++ b/cwiki-view.el @@ -37,13 +37,15 @@ (setq level 1)) (let ((char (www-uri-decode-char uri-char))) (when (characterp char) + (when (= (length uri-char) 1) + (setq uri-char (www-uri-encode-char char))) (when (= level 1) (princ (encode-coding-string (format " CHISE-wiki character: %s \n" - uri-char) + (decode-uri-string uri-char 'utf-8-mcs-er)) 'utf-8-mcs-er)) (princ "\n")) (princ (format "%s\n" @@ -186,13 +188,14 @@ (setq ret (car target)) (cond ((eq (car ret) 'char) (www-display-char-desc - (decode-uri-string (cdr ret) 'utf-8-mcs-er) + (cdr ret) ; (decode-uri-string (cdr ret) 'utf-8-mcs-er) lang) ) ((eq (car ret) 'feature) (www-display-feature-desc (decode-uri-string (cdr ret) 'utf-8-mcs-er) - (decode-uri-string (cdr (assq 'char target))) + (cdr (assq 'char target)) + ;; (decode-uri-string (cdr (assq 'char target))) lang) )) )) -- 1.7.10.4