diff options
| author | Chong Yidong | 2009-06-10 14:15:41 +0000 |
|---|---|---|
| committer | Chong Yidong | 2009-06-10 14:15:41 +0000 |
| commit | 852bbd410bbf625bc08d652d454e03ff8bde167b (patch) | |
| tree | b0c1e5aba124ec0eb3913a2dc90625e0d8444ecc /src | |
| parent | e7777236c6715ce8248fbdea8c77e91d3e3fea90 (diff) | |
| download | emacs-852bbd410bbf625bc08d652d454e03ff8bde167b.tar.gz emacs-852bbd410bbf625bc08d652d454e03ff8bde167b.zip | |
* xdisp.c (get_next_display_element): When handling wrap-prefix
and line-prefix, treat \n as a control character (bug#3502).
Diffstat (limited to 'src')
| -rw-r--r-- | src/ChangeLog | 5 | ||||
| -rw-r--r-- | src/xdisp.c | 3 |
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 @@ | |||
| 1 | 2009-06-10 Chong Yidong <cyd@stupidchicken.com> | ||
| 2 | |||
| 3 | * xdisp.c (get_next_display_element): When handling wrap-prefix | ||
| 4 | and line-prefix, treat \n as a control character (bug#3502). | ||
| 5 | |||
| 1 | 2009-06-10 Kenichi Handa <handa@m17n.org> | 6 | 2009-06-10 Kenichi Handa <handa@m17n.org> |
| 2 | 7 | ||
| 3 | * font.c (font_parse_family_registry): Fix for one-char foundry. | 8 | * 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) | |||
| 5733 | ? (it->area != TEXT_AREA | 5733 | ? (it->area != TEXT_AREA |
| 5734 | /* In mode line, treat \n, \t like other crl chars. */ | 5734 | /* In mode line, treat \n, \t like other crl chars. */ |
| 5735 | || (it->c != '\t' | 5735 | || (it->c != '\t' |
| 5736 | && it->glyph_row && it->glyph_row->mode_line_p) | 5736 | && it->glyph_row |
| 5737 | && (it->glyph_row->mode_line_p || it->avoid_cursor_p)) | ||
| 5737 | || (it->c != '\n' && it->c != '\t')) | 5738 | || (it->c != '\n' && it->c != '\t')) |
| 5738 | : (it->multibyte_p | 5739 | : (it->multibyte_p |
| 5739 | ? (!CHAR_PRINTABLE_P (it->c) | 5740 | ? (!CHAR_PRINTABLE_P (it->c) |