* xdisp.c (handle_invisible_prop): Don't update it->position with

	a buffer position if we're in a display string.

2 files changed, 10 insertions, 2 deletions

diff --git a/src/ChangeLog b/src/ChangeLog
index b4848e99bef..1f27fc7a6f9 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,8 @@
+2006-03-06  Chong Yidong  <cyd@stupidchicken.com>
+
+        * xdisp.c (handle_invisible_prop): Don't update it->position with
+        a buffer position if we're in a display string.
+
 2006-03-06  YAMAMOTO Mitsuharu  <mituharu@math.s.chiba-u.ac.jp>
 
         * macterm.h (MAC_AQUA_VERTICAL_SCROLL_BAR_WIDTH)
diff --git a/src/xdisp.c b/src/xdisp.c
index 2be65a70af9..be40d7652ac 100644
--- a/src/xdisp.c
+++ b/src/xdisp.c
@@ -3658,8 +3658,11 @@ handle_invisible_prop (it)
                  the invisible text.  Otherwise the cursor would be
                  placed _after_ the ellipsis when the point is after the
                  first invisible character.  */
-              it->position.charpos = IT_CHARPOS (*it) - 1;
-              it->position.bytepos = CHAR_TO_BYTE (it->position.charpos);
+              if (!STRINGP (it->object))
+                {
+                  it->position.charpos = IT_CHARPOS (*it) - 1;
+                  it->position.bytepos = CHAR_TO_BYTE (it->position.charpos);
+                }
               setup_for_ellipsis (it, 0);
             }
         }