From: Chong Yidong <cyd@stupidchicken.com>
Date: Sat, 15 Aug 2009 17:30:18 +0000 (+0000)
Subject: * xdisp.c (pop_it): Don't pop into a display vector (Bug#4131).
X-Git-Tag: emacs-pretest-23.1.90~1850
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=f8354c6e36133180444fa1355a445614e7e43011;p=emacs.git

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

diff --git a/src/ChangeLog b/src/ChangeLog
index 0e8d8f6961a..e4162842008 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -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 --git a/src/xdisp.c b/src/xdisp.c
index 33cd722e6b4..a13463555d6 100644
--- a/src/xdisp.c
+++ b/src/xdisp.c
@@ -5167,6 +5167,16 @@ pop_it (it)
     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;