summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorChong Yidong <cyd@stupidchicken.com>2009-06-10 14:15:41 +0000
committerChong Yidong <cyd@stupidchicken.com>2009-06-10 14:15:41 +0000
commit852bbd410bbf625bc08d652d454e03ff8bde167b (patch)
treeb0c1e5aba124ec0eb3913a2dc90625e0d8444ecc
parente7777236c6715ce8248fbdea8c77e91d3e3fea90 (diff)
downloademacs-852bbd410bbf625bc08d652d454e03ff8bde167b.tar.gz
* xdisp.c (get_next_display_element): When handling wrap-prefix
and line-prefix, treat \n as a control character (bug#3502).
-rw-r--r--src/ChangeLog5
-rw-r--r--src/xdisp.c3
2 files changed, 7 insertions, 1 deletions
diff --git a/src/ChangeLog b/src/ChangeLog
index 7b9e2f62b14..67bb245e71f 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 01b16dba539..224dd4853b8 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)