Mercurial > emacs
changeset 69307:2c8c2aaf3daa
* xdisp.c (handle_invisible_prop): Don't update it->position with
a buffer position if we're in a display string.
| author | Chong Yidong <cyd@stupidchicken.com> |
|---|---|
| date | Mon, 06 Mar 2006 18:41:05 +0000 |
| parents | 4a1a9b4c39a6 |
| children | 53ba4b6eeb04 |
| files | src/ChangeLog src/xdisp.c |
| diffstat | 2 files changed, 10 insertions(+), 2 deletions(-) [+] |
line wrap: on
line diff
--- a/src/ChangeLog Mon Mar 06 16:31:46 2006 +0000 +++ b/src/ChangeLog Mon Mar 06 18:41:05 2006 +0000 @@ -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)
--- a/src/xdisp.c Mon Mar 06 16:31:46 2006 +0000 +++ b/src/xdisp.c Mon Mar 06 18:41:05 2006 +0000 @@ -3658,8 +3658,11 @@ 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); } }