From: Kenichi Handa <handa@m17n.org>
Date: Tue, 14 May 2002 08:01:50 +0000 (+0000)
Subject: (JIS_TO_SJIS): Fix typo (j1->s1, j2->s2).
X-Git-Tag: emacs-pretest-23.0.90~8295^2~1864^2~888
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=5afaefc1183a0823555a9ec9a75cbed1c6705695;p=emacs.git

(JIS_TO_SJIS): Fix typo (j1->s1, j2->s2).
---

diff --git a/src/ChangeLog b/src/ChangeLog
index 0a72d657669..03bf26c1c93 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,6 +1,13 @@
 2002-05-14  Kenichi Handa  <handa@etl.go.jp>
 
+	* coding.c (Fdecode_sjis_char): Fix typo (0x7F->0xFF).  Fix the
+	handling of charset list.
+	(encode_coding_iso_2022): Setup coding->safe_charsets in advance.
+
+	* coding.h (JIS_TO_SJIS): Fix typo (j1->s1, j2->s2).
+
 	* charset.c (Fmake_char): Make it more backward compatible.
+	(Fmap_charset_chars): Fix docstring.
 
 2002-05-13  Dave Love  <fx@gnu.org>
 
diff --git a/src/coding.h b/src/coding.h
index cc115b6ef3f..1b14ff445f3 100644
--- a/src/coding.h
+++ b/src/coding.h
@@ -473,7 +473,7 @@ struct coding_system
     else						\
       (s1 = j1 / 2 + ((j1 < 0x5F) ? 0x70 : 0xB0),	\
        s2 = j2 + 0x7E);					\
-    (code) = (j1 << 8) | j2;				\
+    (code) = (s1 << 8) | s2;				\
   } while (0)