diff options
| author | YAMAMOTO Mitsuharu <mituharu@math.s.chiba-u.ac.jp> | 2008-03-03 09:25:30 +0000 |
|---|---|---|
| committer | YAMAMOTO Mitsuharu <mituharu@math.s.chiba-u.ac.jp> | 2008-03-03 09:25:30 +0000 |
| commit | 70f6d79619dea7b743c879389bc6dd89553a0a25 (patch) | |
| tree | 22d940b73b111cbd47bb1252ea00ee4eff45553c | |
| parent | a1ebd734f1f674fe843b5ae65909f51efb6fddcc (diff) | |
| download | emacs-70f6d79619dea7b743c879389bc6dd89553a0a25.tar.gz | |
(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.
| -rw-r--r-- | src/ChangeLog | 6 | ||||
| -rw-r--r-- | src/xdisp.c | 9 |
2 files changed, 9 insertions, 6 deletions
diff --git a/src/ChangeLog b/src/ChangeLog index 30395e9d617..6da585c7a1b 100644 --- a/src/ChangeLog +++ b/src/ChangeLog @@ -1,3 +1,9 @@ +2008-03-03 YAMAMOTO Mitsuharu <mituharu@math.s.chiba-u.ac.jp> + + * xdisp.c (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. + 2008-02-29 Chong Yidong <cyd@stupidchicken.com> * xdisp.c (get_overlay_strings_1): Add missing argument type. diff --git a/src/xdisp.c b/src/xdisp.c index 83792108f42..f362f2c352f 100644 --- a/src/xdisp.c +++ b/src/xdisp.c @@ -4301,15 +4301,13 @@ handle_single_display_spec (it, spec, object, overlay, position, `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 @@ handle_single_display_spec (it, spec, object, overlay, position, /* 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 */ |