# HG changeset patch
# User Kenichi Handa <handa@m17n.org>
# Date 1258093252 0
# Node ID 6b2352662a3fdfec372ddf985975fc740c97e0ec
# Parent  f6c1ac558c84db5f3e887e27f299a7c747c602cf
Make sure that the value of jisx0208 property is jisx0208 character.

diff -r f6c1ac558c84 -r 6b2352662a3f lisp/language/japan-util.el
--- a/lisp/language/japan-util.el	Fri Nov 13 02:40:40 2009 +0000
+++ b/lisp/language/japan-util.el	Fri Nov 13 06:20:52 2009 +0000
@@ -109,10 +109,10 @@
     (?＠ ?@)
     ;; cp932-2-byte
     (#x2015 ?-) (#xFF5E ?~) (#xFF0D ?-))
-  "Japanese JISX0208 symbol character table.
+  "Japanese JISX0208 and CP932 symbol character table.
   Each element is of the form (SYMBOL ASCII HANKAKU), where SYMBOL
-belongs to `japanese-jisx0208', ASCII belongs to `ascii', and HANKAKU
-belongs to `japanese-jisx0201-kana'.")
+belongs to `japanese-jisx0208' or `cp932', ASCII belongs to `ascii',
+and HANKAKU belongs to `japanese-jisx0201-kana'.")
 
 ;; Put properties 'jisx0208, 'jisx0201, and 'ascii to each Japanese
 ;; symbol and ASCII characters for conversion among them.
@@ -125,11 +125,13 @@
     (if ascii
 	(progn
 	  (put-char-code-property jisx0208 'ascii ascii)
-	  (put-char-code-property ascii 'jisx0208 jisx0208)))
+	  (if (encode-char jisx0208 'japanese-jisx0208)
+	      (put-char-code-property ascii 'jisx0208 jisx0208))))
     (if jisx0201
 	(progn
 	  (put-char-code-property jisx0208 'jisx0201 jisx0201)
-	  (put-char-code-property jisx0201 'jisx0208 jisx0208)))))
+	  (if (encode-char jisx0208 'japanese-jisx0208)
+	      (put-char-code-property jisx0201 'jisx0208 jisx0208))))))
 
 (defconst japanese-alpha-numeric-table
   '((?０ . ?0) (?１ . ?1) (?２ . ?2) (?３ . ?3) (?４ . ?4)