diff options
| author | Gerd Moellmann | 1999-11-02 12:22:54 +0000 |
|---|---|---|
| committer | Gerd Moellmann | 1999-11-02 12:22:54 +0000 |
| commit | 1b335865a40d3227b33d15aeeb67366561b8dc23 (patch) | |
| tree | 729402b5f8ef26ae8227f154cf31b98aa2123f21 /src | |
| parent | 9a9dfda89626c95ef44346f5516ada32cd42abba (diff) | |
| download | emacs-1b335865a40d3227b33d15aeeb67366561b8dc23.tar.gz emacs-1b335865a40d3227b33d15aeeb67366561b8dc23.zip | |
(display_line): Set charpos of first glyph in blank
lines not corresponding to any text to -1, even if no glyphs are
filled in in that line.
Diffstat (limited to 'src')
| -rw-r--r-- | src/ChangeLog | 6 | ||||
| -rw-r--r-- | src/xdisp.c | 10 |
2 files changed, 11 insertions, 5 deletions
diff --git a/src/ChangeLog b/src/ChangeLog index 5f081f9858c..2e00d388404 100644 --- a/src/ChangeLog +++ b/src/ChangeLog | |||
| @@ -1,3 +1,9 @@ | |||
| 1 | 1999-11-02 Gerd Moellmann <gerd@gnu.org> | ||
| 2 | |||
| 3 | * xdisp.c (display_line): Set charpos of first glyph in blank | ||
| 4 | lines not corresponding to any text to -1, even if no glyphs are | ||
| 5 | filled in in that line. | ||
| 6 | |||
| 1 | 1999-11-01 Gerd Moellmann <gerd@gnu.org> | 7 | 1999-11-01 Gerd Moellmann <gerd@gnu.org> |
| 2 | 8 | ||
| 3 | * xfns.c (png_load) [PNG_READ_sRGB_SUPPORTED]: Put code using | 9 | * xfns.c (png_load) [PNG_READ_sRGB_SUPPORTED]: Put code using |
diff --git a/src/xdisp.c b/src/xdisp.c index 1c2e22e7a53..7364171f00f 100644 --- a/src/xdisp.c +++ b/src/xdisp.c | |||
| @@ -11009,12 +11009,12 @@ display_line (it) | |||
| 11009 | if (!get_next_display_element (it)) | 11009 | if (!get_next_display_element (it)) |
| 11010 | { | 11010 | { |
| 11011 | /* Maybe add a space at the end of this line that is used to | 11011 | /* Maybe add a space at the end of this line that is used to |
| 11012 | display the cursor there under X. */ | 11012 | display the cursor there under X. Set the charpos of the |
| 11013 | if (append_space (it, 1) && row->used[TEXT_AREA] == 1) | 11013 | first glyph of blank lines not corresponding to any text |
| 11014 | to -1. */ | ||
| 11015 | if ((append_space (it, 1) && row->used[TEXT_AREA] == 1) | ||
| 11016 | || row->used[TEXT_AREA] == 0) | ||
| 11014 | { | 11017 | { |
| 11015 | /* The position -1 below indicates a blank line not | ||
| 11016 | corresponding to any text, as opposed to an empty line | ||
| 11017 | corresponding to a line end. */ | ||
| 11018 | row->glyphs[TEXT_AREA]->charpos = -1; | 11018 | row->glyphs[TEXT_AREA]->charpos = -1; |
| 11019 | row->displays_text_p = 0; | 11019 | row->displays_text_p = 0; |
| 11020 | 11020 | ||