From: MORIOKA Tomohiko <tomo@kanji.zinbun.kyoto-u.ac.jp>
Date: Mon, 29 Mar 2010 13:16:13 +0000 (+0900)
Subject: (coded-charset-GlyphWiki-id-alist): Add setting for `=ucs@jis',
X-Git-Url: http://git.chise.org/gitweb/?a=commitdiff_plain;h=42d79a555c5d6942120ab0cc04692a9eaa11afe1;p=chise%2Fest.git

(coded-charset-GlyphWiki-id-alist): Add setting for `=ucs@jis',
`=jis-x0208@1978/-4pr' and `=jis-x0208@1978'.
(char-GlyphWiki-id): Use `char-feature' instead of `encode-char'.
---

diff --git a/cwiki-common.el b/cwiki-common.el
index a6815ef..e395bfd 100644
--- a/cwiki-common.el
+++ b/cwiki-common.el
@@ -841,18 +841,21 @@
 
 (defvar coded-charset-GlyphWiki-id-alist
   '((=ucs		"u"	4 x nil)
-    (=ucs@iso		"u"	4 x "-u")
-    (=ucs@unicode	"u"	4 x "-us")
     (=ucs@JP		"u"	4 x nil)
+    (=ucs@jis		"u"	4 x nil)
     (=ucs@gb		"u"	4 x "-g")
     (=ucs@cns		"u"	4 x "-t")
     (=ucs@ks		"u"	4 x "-k")
+    (=ucs@iso		"u"	4 x "-u")
+    (=ucs@unicode	"u"	4 x "-us")
     (=adobe-japan1-6	"aj1-"	5 d nil)
     (=gt		"gt-"	5 d nil)
     (=gt-k		"gt-k"	5 d nil)
     (=big5-cdp		"cdp-"	4 x nil)
     (=cbeta		"cb"	5 d nil)
     (=jis-x0208@1978/1pr "j78-"	4 x nil)
+    (=jis-x0208@1978/-4pr "j78-" 4 x nil)
+    (=jis-x0208@1978	"j78-"	4 x nil)
     (=jis-x0208@1983	"j83-"	4 x nil)
     (=jis-x0208@1990	"j90-"	4 x nil)
     (=jis-x0212		"jsp-"	4 x nil)
@@ -878,7 +881,7 @@
 	ret)
     (while (and rest
 		(setq spec (pop rest))
-		(null (setq ret (encode-char char (car spec))))))
+		(null (setq ret (char-feature char (car spec))))))
     (when ret
       (format (format "%s%%0%d%s%s"
 		      (nth 1 spec)