changeset 110335:f226899b26ca

merge emacs-23
author Kenichi Handa <handa@m17n.org>
date Tue, 07 Sep 2010 20:22:15 +0900
parents 4ad4f097835e (diff) 0a214cbe7bf3 (current diff)
children 3ffb3b102dae 08056547de92
files
diffstat 2 files changed, 6 insertions(+), 1 deletions(-) [+]
line wrap: on
line diff
--- a/src/ChangeLog	Mon Sep 06 12:24:59 2010 -0400
+++ b/src/ChangeLog	Tue Sep 07 20:22:15 2010 +0900
@@ -1,3 +1,8 @@
+2010-09-07  Kenichi Handa  <handa@m17n.org>
+
+	* coding.c (detect_coding_emacs_mule): Fix checking of multibyte
+	sequence when the source is multibyte.
+
 2010-08-31  Kenichi Handa  <handa@m17n.org>
 
 	* dispextern.h (FACE_FOR_CHAR): Use an ASCII face for 8-bit
--- a/src/coding.c	Mon Sep 06 12:24:59 2010 -0400
+++ b/src/coding.c	Tue Sep 07 20:22:15 2010 +0900
@@ -2031,7 +2031,7 @@
 	}
       else
 	{
-	  int more_bytes = emacs_mule_bytes[*src_base] - 1;
+	  int more_bytes = emacs_mule_bytes[c] - 1;
 
 	  while (more_bytes > 0)
 	    {