# HG changeset patch
# User Chong Yidong <cyd@stupidchicken.com>
# Date 1250357418 0
# Node ID 222761334e34a30ab44fe1c5f1bc55aafab7658b
# Parent  52ff955e0cc5466a1c2cb055937e3c5efddc3cdb
* xdisp.c (pop_it): Don't pop into a display vector (Bug#4131).

diff -r 52ff955e0cc5 -r 222761334e34 src/ChangeLog
--- a/src/ChangeLog	Sat Aug 15 14:06:02 2009 +0000
+++ b/src/ChangeLog	Sat Aug 15 17:30:18 2009 +0000
@@ -1,5 +1,7 @@
 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)
 	(swap_out_buffer_local_variables): Check for unbound local
 	variables (Bug#4138).
diff -r 52ff955e0cc5 -r 222761334e34 src/xdisp.c
--- a/src/xdisp.c	Sat Aug 15 14:06:02 2009 +0000
+++ b/src/xdisp.c	Sat Aug 15 17:30:18 2009 +0000
@@ -5167,6 +5167,16 @@
     case GET_FROM_STRING:
       it->object = it->string;
       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->string_nchars = p->string_nchars;