Mercurial > emacs
changeset 80268:b70bf168951d
(handle_single_display_spec): Undo 2007-10-16 changes.
Don't pretend as if characters with display property haven't been
consumed for string-replacing-string case.
| author | YAMAMOTO Mitsuharu <mituharu@math.s.chiba-u.ac.jp> |
|---|---|
| date | Mon, 03 Mar 2008 09:24:57 +0000 |
| parents | c1d9521017f6 |
| children | bec081c42aa7 |
| files | src/xdisp.c |
| diffstat | 1 files changed, 3 insertions(+), 6 deletions(-) [+] |
line wrap: on
line diff
--- a/src/xdisp.c Mon Mar 03 08:52:49 2008 +0000 +++ b/src/xdisp.c Mon Mar 03 09:24:57 2008 +0000 @@ -4301,15 +4301,13 @@ `display' property yet. The call to pop_it in set_iterator_to_next will clean this up. */ if (BUFFERP (object)) - it->current.pos = start_pos; + *position = start_pos; } else if (CONSP (value) && EQ (XCAR (value), Qspace)) { it->method = GET_FROM_STRETCH; it->object = value; - it->position = start_pos; - if (BUFFERP (object)) - it->current.pos = start_pos; + *position = it->position = start_pos; } #ifdef HAVE_WINDOW_SYSTEM else @@ -4323,8 +4321,7 @@ /* Say that we haven't consumed the characters with `display' property yet. The call to pop_it in set_iterator_to_next will clean this up. */ - if (BUFFERP (object)) - it->current.pos = start_pos; + *position = start_pos; } #endif /* HAVE_WINDOW_SYSTEM */