* 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 7b9e2f62b140b378c3311f08f07b195a4761bdb7..67bb245e71ff15356e074e24a05545d2ba76f171 100644 (file)
--- 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 01b16dba539720a34b70543704fda3f5eddd90fc..224dd4853b8e4806ca80651dce8d8a51efc86d15 100644 (file)
--- 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)