Merged in changes from CVS trunk.

Patches applied:

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

 * miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-668
   Merge from gnus--rel--5.10

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

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

 * miles@gnu.org--gnu-2005/gnus--rel--5.10--patch-157
   Merge from emacs--cvs-trunk--0

 * miles@gnu.org--gnu-2005/gnus--rel--5.10--patch-158
   Update from CVS

 * miles@gnu.org--gnu-2005/gnus--rel--5.10--patch-159
   Update from CVS

 * miles@gnu.org--gnu-2005/gnus--rel--5.10--patch-160
   Update from CVS

 * miles@gnu.org--gnu-2005/gnus--rel--5.10--patch-161
   Update from CVS

 * miles@gnu.org--gnu-2005/gnus--rel--5.10--patch-162
   Update from CVS

 * miles@gnu.org--gnu-2005/gnus--rel--5.10--patch-163
   Update from CVS

 * miles@gnu.org--gnu-2005/gnus--rel--5.10--patch-164
   Update from CVS

 * miles@gnu.org--gnu-2005/gnus--rel--5.10--patch-165
   Update from CVS: texi/message.texi: Fix default values.

 * miles@gnu.org--gnu-2005/gnus--rel--5.10--patch-166
   Update from CVS

 * miles@gnu.org--gnu-2005/gnus--rel--5.10--patch-167
   Update from CVS

 * miles@gnu.org--gnu-2005/gnus--rel--5.10--patch-168
   Update from CVS


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

1 files changed, 7 insertions, 5 deletions

diff --git a/src/indent.c b/src/indent.c
index 68544e8059d..6ca15c67345 100644
--- a/src/indent.c
+++ b/src/indent.c
@@ -2076,7 +2076,7 @@ whether or not it is currently displayed in some window.  */)
     {
       int it_start;
       int oselective;
-      int start_on_image_p;
+      int start_on_image_or_stretch_p;
 
       SET_TEXT_POS (pt, PT, PT_BYTE);
       start_display (&it, w, pt);
@@ -2088,7 +2088,8 @@ whether or not it is currently displayed in some window.  */)
          while the end position is really at some X > 0, the same X that
          PT had.  */
       it_start = IT_CHARPOS (it);
-      start_on_image_p = (it.method == GET_FROM_IMAGE);
+      start_on_image_or_stretch_p = (it.method == GET_FROM_IMAGE
+                                     || it.method == GET_FROM_STRETCH);
       reseat_at_previous_visible_line_start (&it);
       it.current_x = it.hpos = 0;
       /* Temporarily disable selective display so we don't move too far */
@@ -2099,9 +2100,10 @@ whether or not it is currently displayed in some window.  */)
 
       /* Move back if we got too far.  This may happen if
          truncate-lines is on and PT is beyond right margin.
-         It may also happen if it_start is on an image --
-         in that case, don't go back.  */
-      if (IT_CHARPOS (it) > it_start && XINT (lines) > 0 && !start_on_image_p)
+         It may also happen if it_start is on an image or a stretch
+         glyph -- in that case, don't go back.  */
+      if (IT_CHARPOS (it) > it_start && XINT (lines) > 0
+          && !start_on_image_or_stretch_p)
         move_it_by_lines (&it, -1, 0);
 
       it.vpos = 0;