From: Chong Yidong <cyd@stupidchicken.com>
Date: Wed, 10 Jun 2009 14:15:41 +0000 (+0000)
Subject: * xdisp.c (get_next_display_element): When handling wrap-prefix
X-Git-Tag: emacs-pretest-23.0.95~92
X-Git-Url: https://code.delx.au/gnu-emacs/commitdiff_plain/852bbd410bbf625bc08d652d454e03ff8bde167b

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

diff --git a/src/ChangeLog b/src/ChangeLog
index 7b9e2f62b1..67bb245e71 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -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 --git a/src/xdisp.c b/src/xdisp.c
index 01b16dba53..224dd4853b 100644
--- a/src/xdisp.c
+++ b/src/xdisp.c
@@ -5733,7 +5733,8 @@ get_next_display_element (it)
 		    ? (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)