[Emacs-diffs] /srv/bzr/emacs/trunk r107210: Merge from emacs-23; up to r100661.

[Glenn Morris]

------------------------------------------------------------
revno: 107210 [merge]
committer: Glenn Morris <address@hidden>
branch nick: trunk
timestamp: Wed 2012-02-08 23:48:22 -0800
message:
  Merge from emacs-23; up to r100661.
modified:
  src/ChangeLog
  src/coding.c

=== modified file 'src/ChangeLog'
--- a/src/ChangeLog     2012-02-07 06:34:52 +0000
+++ b/src/ChangeLog     2012-02-09 07:48:22 +0000
@@ -1,3 +1,7 @@
+2012-02-09  Kenichi Handa  <address@hidden>
+
+       * coding.c (produce_chars): Fix updating of src_end (Bug#10701).
+
 2012-02-07  Chong Yidong  <address@hidden>
 
        * buffer.c (Fbuffer_local_variables)

=== modified file 'src/coding.c'
--- a/src/coding.c      2012-01-25 05:55:01 +0000
+++ b/src/coding.c      2012-02-09 07:48:22 +0000
@@ -6849,7 +6849,7 @@
                          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 @@
                        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 @@
                  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;