From: Kenichi Handa <handa@m17n.org>
Date: Wed, 8 Jul 2009 02:23:19 +0000 (+0000)
Subject: (JIS_TO_SJIS2): Fix the code range check.
X-Git-Tag: emacs-pretest-23.1.90~2280
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=edb61b39fd80ced68dee7460716d2db6857fab28;p=emacs.git

(JIS_TO_SJIS2): Fix the code range check.
---

diff --git a/src/ChangeLog b/src/ChangeLog
index d9ff8b1dfd2..94c71a92176 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,10 @@
+2009-07-08  Kenichi Handa  <handa@m17n.org>
+
+	* coding.h (JIS_TO_SJIS2): Fix the code range check.
+
+	* coding.c (detect_coding_sjis): Handle shift_jis-2004 correctly.
+	(encode_coding_sjis): Fix the code range check.
+
 2009-07-07  Chong Yidong  <cyd@stupidchicken.com>
 
 	* fileio.c (Fsubstitute_in_file_name, Ffile_name_directory)
diff --git a/src/coding.h b/src/coding.h
index 153ec952093..450433fda96 100644
--- a/src/coding.h
+++ b/src/coding.h
@@ -630,7 +630,7 @@ struct coding_system
     if (j1 & 1)						\
       {							\
 	s1 = (j1 <= 0x25 ? 0xF0 + (j1 - 0x21) / 2	\
-	      : j1 <= 0x27 ? 0xF3 + (j1 - 0x2D) / 2	\
+	      : j1 <= 0x2F ? 0xF3 + (j1 - 0x2D) / 2	\
 	      : 0xF5 + (j1 - 0x6F) / 2);		\
 	s2 = j2 + ((j2 >= 0x60) ? 0x20 : 0x1F);		\
       }							\