Commit f8354c6e authored by Chong Yidong's avatar Chong Yidong

* xdisp.c (pop_it): Don't pop into a display vector (Bug#4131).

parent b5b98ff4
2009-08-15 Chong Yidong <cyd@stupidchicken.com> 2009-08-15 Chong Yidong <cyd@stupidchicken.com>
* xdisp.c (pop_it): Don't pop into a display vector (Bug#4131).
* buffer.c (set_buffer_internal_1) * buffer.c (set_buffer_internal_1)
(swap_out_buffer_local_variables): Check for unbound local (swap_out_buffer_local_variables): Check for unbound local
variables (Bug#4138). variables (Bug#4138).
......
...@@ -5167,6 +5167,16 @@ pop_it (it) ...@@ -5167,6 +5167,16 @@ pop_it (it)
case GET_FROM_STRING: case GET_FROM_STRING:
it->object = it->string; it->object = it->string;
break; break;
case GET_FROM_DISPLAY_VECTOR:
if (it->s)
it->method = GET_FROM_C_STRING;
else if (STRINGP (it->string))
it->method = GET_FROM_STRING;
else
{
it->method = GET_FROM_BUFFER;
it->object = it->w->buffer;
}
} }
it->end_charpos = p->end_charpos; it->end_charpos = p->end_charpos;
it->string_nchars = p->string_nchars; it->string_nchars = p->string_nchars;
......
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