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

[Chong Yidong]

CVSROOT:        /sources/emacs
Module name:    emacs
Changes by:     Chong Yidong <cyd>      09/06/10 14:15:52

Modified files:
        src            : ChangeLog xdisp.c 

Log message:
        * xdisp.c (get_next_display_element): When handling wrap-prefix
        and line-prefix, treat \n as a control character (bug#3502).

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/emacs/src/ChangeLog?cvsroot=emacs&r1=1.7567&r2=1.7568
http://cvs.savannah.gnu.org/viewcvs/emacs/src/xdisp.c?cvsroot=emacs&r1=1.1282&r2=1.1283

Patches:
Index: ChangeLog
===================================================================
RCS file: /sources/emacs/emacs/src/ChangeLog,v
retrieving revision 1.7567
retrieving revision 1.7568
diff -u -b -r1.7567 -r1.7568
--- ChangeLog   10 Jun 2009 07:40:31 -0000      1.7567
+++ ChangeLog   10 Jun 2009 14:15:41 -0000      1.7568
@@ -1,3 +1,8 @@
+2009-06-10  Chong Yidong  <address@hidden>
+
+       * xdisp.c (get_next_display_element): When handling wrap-prefix
+       and line-prefix, treat \n as a control character (bug#3502).
+
 2009-06-10  Kenichi Handa  <address@hidden>
 
        * font.c (font_parse_family_registry): Fix for one-char foundry.

Index: xdisp.c
===================================================================
RCS file: /sources/emacs/emacs/src/xdisp.c,v
retrieving revision 1.1282
retrieving revision 1.1283
diff -u -b -r1.1282 -r1.1283
--- xdisp.c     7 Jun 2009 21:37:12 -0000       1.1282
+++ xdisp.c     10 Jun 2009 14:15:50 -0000      1.1283
@@ -5733,7 +5733,8 @@
                    ? (it->area != TEXT_AREA
                       /* In mode line, treat \n, \t like other crl chars.  */
                       || (it->c != '\t'
-                          && it->glyph_row && it->glyph_row->mode_line_p)
+                          && it->glyph_row
+                          && (it->glyph_row->mode_line_p || 
it->avoid_cursor_p))
                       || (it->c != '\n' && it->c != '\t'))
                    : (it->multibyte_p
                       ? (!CHAR_PRINTABLE_P (it->c)