Merge from emacs-23; up to 2010-06-29T18:17:31Z!cyd@stupidchicken.com.

f998bbe7 · Glenn Morris · 9fcfcdef · 5c1ca13d · f998bbe7 · f998bbe7
Commit f998bbe7 authored Feb 08, 2012 by Glenn Morris
Hide whitespace changes
Inline Side-by-side

Showing with 7 additions and 3 deletions

src/ChangeLog src/ChangeLog +4 -0

src/coding.c src/coding.c +3 -3

No files found.
--- a/src/ChangeLog
+++ b/src/ChangeLog
+2012-02-09  Kenichi Handa  <handa@m17n.org>
+
+	* coding.c (produce_chars): Fix updating of src_end (Bug#10701).
+
 2012-02-07  Chong Yidong  <cyd@gnu.org>

 	* buffer.c (Fbuffer_local_variables)

--- a/src/coding.c
+++ b/src/coding.c
@@ -6849,7 +6849,7 @@ produce_chars (struct coding_system *coding, Lisp_Object translation_table,
 			  dst_end = coding->destination + coding->dst_bytes;
 			  coding_set_source (coding);
 			  src = coding->source + offset;
-			  src_end = coding->source + coding->src_bytes;
+			  src_end = coding->source + coding->consumed;
 			  if (EQ (coding->src_object, coding->dst_object))
 			    dst_end = (unsigned char *) src;
 			}
@@ -6883,7 +6883,7 @@ produce_chars (struct coding_system *coding, Lisp_Object translation_table,
 			dst_end = coding->destination + coding->dst_bytes;
 			coding_set_source (coding);
 			src = coding->source + offset;
-			src_end = coding->source + coding->src_bytes;
+			src_end = coding->source + coding->consumed;
 			if (EQ (coding->src_object, coding->dst_object))
 			  dst_end = (unsigned char *) src;
 		      }
@@ -6904,7 +6904,7 @@ produce_chars (struct coding_system *coding, Lisp_Object translation_table,
 		  dst = alloc_destination (coding, require, dst);
 		  coding_set_source (coding);
 		  src = coding->source + offset;
-		  src_end = coding->source + coding->src_bytes;
+		  src_end = coding->source + coding->consumed;
 		}
 	    }
 	  produced_chars = coding->consumed_char;