# HG changeset patch
# User Chong Yidong <cyd@stupidchicken.com>
# Date 1244643341 0
# Node ID 16b4872ef632dd3a4388169ba37ad48c4c459edf
# Parent  1c54e0632a495ee0dcf102998b089989e9cdc11d
* xdisp.c (get_next_display_element): When handling wrap-prefix
and line-prefix, treat \n as a control character (bug#3502).

diff -r 1c54e0632a49 -r 16b4872ef632 src/ChangeLog
--- a/src/ChangeLog	Wed Jun 10 07:40:31 2009 +0000
+++ b/src/ChangeLog	Wed Jun 10 14:15:41 2009 +0000
@@ -1,3 +1,8 @@
+2009-06-10  Chong Yidong  <cyd@stupidchicken.com>
+
+	* 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  <handa@m17n.org>
 
 	* font.c (font_parse_family_registry): Fix for one-char foundry.
diff -r 1c54e0632a49 -r 16b4872ef632 src/xdisp.c
--- a/src/xdisp.c	Wed Jun 10 07:40:31 2009 +0000
+++ b/src/xdisp.c	Wed Jun 10 14:15:41 2009 +0000
@@ -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)