Merged in changes from CVS trunk.

Patches applied:

 * miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-479
   Update from CVS

 * miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-480
   Update from CVS

 * miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-481
   Update from CVS


git-archimport-id: lorentey@elte.hu--2004/emacs--multi-tty--0--patch-227

3 files changed, 13 insertions, 3 deletions

diff --git a/src/ChangeLog b/src/ChangeLog
index 0194c4b8c6f..2b0c47862d4 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,8 @@
+2004-08-03  Kenichi Handa  <handa@m17n.org>
+
+        * coding.c (decode_coding_string): Adjust coding->consumed, and
+        etc. with shrinked_bytes.
+
 2004-08-03  Kim F. Storm  <storm@cua.dk>
 
         * indent.c (compute_motion): Fix check for full width window
diff --git a/src/coding.c b/src/coding.c
index b36f7fbfbff..1257771d3ed 100644
--- a/src/coding.c
+++ b/src/coding.c
@@ -6234,6 +6234,11 @@ decode_coding_string (str, coding, nocopy)
                    shrinked_bytes - from);
   free_conversion_buffer (&buf);
 
+  coding->consumed += shrinked_bytes;
+  coding->consumed_char += shrinked_bytes;
+  coding->produced += shrinked_bytes;
+  coding->produced_char += shrinked_bytes;
+
   if (coding->cmp_data && coding->cmp_data->used)
     coding_restore_composition (coding, newstr);
   coding_free_composition_data (coding);
diff --git a/src/indent.c b/src/indent.c
index d6fea34f5f5..ffde428c12f 100644
--- a/src/indent.c
+++ b/src/indent.c
@@ -1262,10 +1262,10 @@ compute_motion (from, fromvpos, fromhpos, did_motion, to, tovpos, tohpos, width,
         width -= 1;
     }
 
-  continuation_glyph_width = 0;
+  continuation_glyph_width = 1;
 #ifdef HAVE_WINDOW_SYSTEM
-  if (!FRAME_WINDOW_P (XFRAME (win->frame)))
-    continuation_glyph_width = 1;
+  if (FRAME_WINDOW_P (XFRAME (win->frame)))
+    continuation_glyph_width = 0;  /* In the fringe.  */
 #endif
 
   immediate_quit = 1;