diff options
| author | Eli Zaretskii | 2014-04-18 11:35:09 +0300 |
|---|---|---|
| committer | Eli Zaretskii | 2014-04-18 11:35:09 +0300 |
| commit | ea0ca0f45870e18517a234726e59fd7c6dbb4d15 (patch) | |
| tree | db5a3cb2057dd5740a10051158685f91238f42fb /src | |
| parent | ad62a11591180447cc36faec3308d3cf5617d80d (diff) | |
| download | emacs-ea0ca0f45870e18517a234726e59fd7c6dbb4d15.tar.gz emacs-ea0ca0f45870e18517a234726e59fd7c6dbb4d15.zip | |
Fix bug #17288 with inserting left truncation glyph under linum-mode.
src/xdisp.c (insert_left_trunc_glyphs): Ensure the left truncation
glyph is written to TEXT_AREA of the temporary glyph_row.
Diffstat (limited to 'src')
| -rw-r--r-- | src/ChangeLog | 6 | ||||
| -rw-r--r-- | src/xdisp.c | 1 |
2 files changed, 7 insertions, 0 deletions
diff --git a/src/ChangeLog b/src/ChangeLog index e8f122d3c76..e7b8384b431 100644 --- a/src/ChangeLog +++ b/src/ChangeLog | |||
| @@ -1,3 +1,9 @@ | |||
| 1 | 2014-04-18 Eli Zaretskii <eliz@gnu.org> | ||
| 2 | |||
| 3 | * xdisp.c (insert_left_trunc_glyphs): Ensure the left truncation | ||
| 4 | glyph is written to TEXT_AREA of the temporary glyph_row. | ||
| 5 | (Bug#17288) | ||
| 6 | |||
| 1 | 2014-04-18 Paul Eggert <eggert@cs.ucla.edu> | 7 | 2014-04-18 Paul Eggert <eggert@cs.ucla.edu> |
| 2 | 8 | ||
| 3 | * emacs.c (close_output_streams): Don't clear and restore errno. | 9 | * emacs.c (close_output_streams): Don't clear and restore errno. |
diff --git a/src/xdisp.c b/src/xdisp.c index ad5f6a6bf83..88d61a6bbc0 100644 --- a/src/xdisp.c +++ b/src/xdisp.c | |||
| @@ -18688,6 +18688,7 @@ insert_left_trunc_glyphs (struct it *it) | |||
| 18688 | truncate_it.current_x = 0; | 18688 | truncate_it.current_x = 0; |
| 18689 | truncate_it.face_id = DEFAULT_FACE_ID; | 18689 | truncate_it.face_id = DEFAULT_FACE_ID; |
| 18690 | truncate_it.glyph_row = &scratch_glyph_row; | 18690 | truncate_it.glyph_row = &scratch_glyph_row; |
| 18691 | truncate_it.area = TEXT_AREA; | ||
| 18691 | truncate_it.glyph_row->used[TEXT_AREA] = 0; | 18692 | truncate_it.glyph_row->used[TEXT_AREA] = 0; |
| 18692 | CHARPOS (truncate_it.position) = BYTEPOS (truncate_it.position) = -1; | 18693 | CHARPOS (truncate_it.position) = BYTEPOS (truncate_it.position) = -1; |
| 18693 | truncate_it.object = make_number (0); | 18694 | truncate_it.object = make_number (0); |