diff options
| author | Richard M. Stallman | 2004-11-15 13:34:40 +0000 |
|---|---|---|
| committer | Richard M. Stallman | 2004-11-15 13:34:40 +0000 |
| commit | 27418463ce52820673b52782a860ccf368cb5550 (patch) | |
| tree | b276e3aac8ec57374a6cf475ef77816233d0c729 /src | |
| parent | 10980463d7c391cc890d5b918937eb82f9bcd8c8 (diff) | |
| download | emacs-27418463ce52820673b52782a860ccf368cb5550.tar.gz emacs-27418463ce52820673b52782a860ccf368cb5550.zip | |
(get_next_display_element): Fix previous change.
Diffstat (limited to 'src')
| -rw-r--r-- | src/ChangeLog | 4 | ||||
| -rw-r--r-- | src/xdisp.c | 2 |
2 files changed, 5 insertions, 1 deletions
diff --git a/src/ChangeLog b/src/ChangeLog index 956ad26e4ad..a21effceed4 100644 --- a/src/ChangeLog +++ b/src/ChangeLog | |||
| @@ -1,3 +1,7 @@ | |||
| 1 | 2004-11-15 Richard M. Stallman <rms@gnu.org> | ||
| 2 | |||
| 3 | * xdisp.c (get_next_display_element): Fix previous change. | ||
| 4 | |||
| 1 | 2004-11-14 Jan Dj,Ad(Brv <jan.h.d@swipnet.se> | 5 | 2004-11-14 Jan Dj,Ad(Brv <jan.h.d@swipnet.se> |
| 2 | 6 | ||
| 3 | * window.c (shrink_windows): Handle special case of one window left | 7 | * window.c (shrink_windows): Handle special case of one window left |
diff --git a/src/xdisp.c b/src/xdisp.c index 14a64187f1c..9c86e579c0c 100644 --- a/src/xdisp.c +++ b/src/xdisp.c | |||
| @@ -4898,7 +4898,7 @@ get_next_display_element (it) | |||
| 4898 | else if ((it->c < ' ' | 4898 | else if ((it->c < ' ' |
| 4899 | && (it->area != TEXT_AREA | 4899 | && (it->area != TEXT_AREA |
| 4900 | /* In mode line, treat \n like other crl chars. */ | 4900 | /* In mode line, treat \n like other crl chars. */ |
| 4901 | || (it->c == '\n' | 4901 | || (it->c != '\n' |
| 4902 | && it->glyph_row && it->glyph_row->mode_line_p) | 4902 | && it->glyph_row && it->glyph_row->mode_line_p) |
| 4903 | || (it->c != '\n' && it->c != '\t'))) | 4903 | || (it->c != '\n' && it->c != '\t'))) |
| 4904 | || (it->multibyte_p | 4904 | || (it->multibyte_p |