From: tomo <tomo>
Date: Thu, 16 Sep 2004 16:47:29 +0000 (+0000)
Subject: (char-db-coded-charset-priority-list): Add `=jis-x0208@1997'.
X-Git-Tag: r21-4-15-u2km-0_21-32-a~2^2~269
X-Git-Url: http://git.chise.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=56d1227c2c03af55779b36687d23df7bd1396db3;p=chise%2Fxemacs-chise.git.1

(char-db-coded-charset-priority-list): Add `=jis-x0208@1997'.
(insert-char-attributes): Use `=jis-x0208@{1990|1983|1978}' instead of
`=jis-x0208-{1990|1983|1978}'.
---

diff --git a/lisp/utf-2000/char-db-util.el b/lisp/utf-2000/char-db-util.el
index 21cc506..ff80774 100644
--- a/lisp/utf-2000/char-db-util.el
+++ b/lisp/utf-2000/char-db-util.el
@@ -168,6 +168,7 @@
     =big5
     =big5-eten
     =gt-k
+    =jis-x0208@1997
     =jef-china3))
 
 (defun char-db-make-char-spec (char)
@@ -859,8 +860,7 @@
 			  (prog1
 			      (setq value (get-char-attribute char name))
 			    (setq dest-ccss (cons name dest-ccss))))
-		     (char-db-insert-ccs-feature name value line-breaking)
-		     )
+		     (char-db-insert-ccs-feature name value line-breaking))
 		 )
 		((string-match "^=>ucs@" (symbol-name name))
 		 (insert (format "(%-18s . #x%04X)\t; %c%s"
@@ -928,12 +928,12 @@
 			      (setq required-features
 				    (union required-features
 					   '(=jis-x0208
-					     =jis-x0208-1990
+					     =jis-x0208@1990
 					     =jis-x0213-1-2000
 					     =jis-x0213-2-2000
 					     =jis-x0212
-					     =jis-x0208-1983
-					     =jis-x0208-1978))))
+					     =jis-x0208@1983
+					     =jis-x0208@1978))))
 			     ((eq source 'CN)
 			      (setq required-features
 				    (union required-features
@@ -951,12 +951,12 @@
 				 (setq required-features
 				       (union required-features
 					      '(=jis-x0208
-						=jis-x0208-1990
+						=jis-x0208@1990
 						=jis-x0213-1-2000
 						=jis-x0213-2-2000
 						=jis-x0212
-						=jis-x0208-1983
-						=jis-x0208-1978))))
+						=jis-x0208@1983
+						=jis-x0208@1978))))
 				((string-match "@CN" (symbol-name name))
 				 (setq required-features
 				       (union required-features