[Emacs-diffs] emacs/src xdisp.c

[Chong Yidong]

CVSROOT:        /sources/emacs
Module name:    emacs
Changes by:     Chong Yidong <cyd>      09/02/14 17:28:09

Modified files:
        src            : xdisp.c 

Log message:
        (push_it, pop_it): Save and restore line_wrap.
        (handle_line_prefix): Suppress wrapping of wrap prefixes.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/emacs/src/xdisp.c?cvsroot=emacs&r1=1.1276&r2=1.1277

Patches:
Index: xdisp.c
===================================================================
RCS file: /sources/emacs/emacs/src/xdisp.c,v
retrieving revision 1.1276
retrieving revision 1.1277
diff -u -b -r1.1276 -r1.1277
--- xdisp.c     12 Feb 2009 05:54:20 -0000      1.1276
+++ xdisp.c     14 Feb 2009 17:28:08 -0000      1.1277
@@ -5136,6 +5136,7 @@
   p->voffset = it->voffset;
   p->string_from_display_prop_p = it->string_from_display_prop_p;
   p->display_ellipsis_p = 0;
+  p->line_wrap = it->line_wrap;
   ++it->sp;
 }
 
@@ -5191,6 +5192,7 @@
   it->font_height = p->font_height;
   it->voffset = p->voffset;
   it->string_from_display_prop_p = p->string_from_display_prop_p;
+  it->line_wrap = p->line_wrap;
 }
 
 
@@ -16506,7 +16508,13 @@
        prefix = Vline_prefix;
     }
   if (! NILP (prefix))
+    {
     push_display_prop (it, prefix);
+      /* If the prefix is wider than the window, and we try to wrap
+        it, it would acquire its own wrap prefix, and so on till the
+        iterator stack overflows.  So, don't wrap the prefix.  */
+      it->line_wrap = TRUNCATE;
+    }
 }