Commit 70f6d796 authored by YAMAMOTO Mitsuharu's avatar YAMAMOTO Mitsuharu
Browse files

(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.
parent a1ebd734
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> 2008-02-29 Chong Yidong <cyd@stupidchicken.com>
   
* xdisp.c (get_overlay_strings_1): Add missing argument type. * xdisp.c (get_overlay_strings_1): Add missing argument type.
......
...@@ -4301,15 +4301,13 @@ handle_single_display_spec (it, spec, object, overlay, position, ...@@ -4301,15 +4301,13 @@ handle_single_display_spec (it, spec, object, overlay, position,
`display' property yet. The call to pop_it in `display' property yet. The call to pop_it in
set_iterator_to_next will clean this up. */ set_iterator_to_next will clean this up. */
if (BUFFERP (object)) if (BUFFERP (object))
it->current.pos = start_pos; *position = start_pos;
} }
else if (CONSP (value) && EQ (XCAR (value), Qspace)) else if (CONSP (value) && EQ (XCAR (value), Qspace))
{ {
it->method = GET_FROM_STRETCH; it->method = GET_FROM_STRETCH;
it->object = value; it->object = value;
it->position = start_pos; *position = it->position = start_pos;
if (BUFFERP (object))
it->current.pos = start_pos;
} }
#ifdef HAVE_WINDOW_SYSTEM #ifdef HAVE_WINDOW_SYSTEM
else else
...@@ -4323,8 +4321,7 @@ handle_single_display_spec (it, spec, object, overlay, position, ...@@ -4323,8 +4321,7 @@ handle_single_display_spec (it, spec, object, overlay, position,
/* Say that we haven't consumed the characters with /* Say that we haven't consumed the characters with
`display' property yet. The call to pop_it in `display' property yet. The call to pop_it in
set_iterator_to_next will clean this up. */ set_iterator_to_next will clean this up. */
if (BUFFERP (object)) *position = start_pos;
it->current.pos = start_pos;
} }
#endif /* HAVE_WINDOW_SYSTEM */ #endif /* HAVE_WINDOW_SYSTEM */
   
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment