diff src/xdisp.c @ 104281:222761334e34

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

--- 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;