[Emacs-diffs] emacs/src ChangeLog xdisp.c

[Chong Yidong]

CVSROOT:        /sources/emacs
Module name:    emacs
Changes by:     Chong Yidong <cyd>      09/08/15 17:30:24

Modified files:
        src            : ChangeLog xdisp.c 

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

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/emacs/src/ChangeLog?cvsroot=emacs&r1=1.7686&r2=1.7687
http://cvs.savannah.gnu.org/viewcvs/emacs/src/xdisp.c?cvsroot=emacs&r1=1.1294&r2=1.1295

Patches:
Index: ChangeLog
===================================================================
RCS file: /sources/emacs/emacs/src/ChangeLog,v
retrieving revision 1.7686
retrieving revision 1.7687
diff -u -b -r1.7686 -r1.7687
--- ChangeLog   15 Aug 2009 14:06:02 -0000      1.7686
+++ ChangeLog   15 Aug 2009 17:30:18 -0000      1.7687
@@ -1,5 +1,7 @@
 2009-08-15  Chong Yidong  <address@hidden>
 
+       * 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).

Index: xdisp.c
===================================================================
RCS file: /sources/emacs/emacs/src/xdisp.c,v
retrieving revision 1.1294
retrieving revision 1.1295
diff -u -b -r1.1294 -r1.1295
--- xdisp.c     21 Jul 2009 20:12:10 -0000      1.1294
+++ xdisp.c     15 Aug 2009 17:30:21 -0000      1.1295
@@ -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;