diff options
| author | Alan Mackenzie | 2022-01-22 11:02:50 +0000 |
|---|---|---|
| committer | Alan Mackenzie | 2022-01-22 11:02:50 +0000 |
| commit | 14d64a8adcc866deecd758b898e8ef2d836b354a (patch) | |
| tree | 83cff9669e266f8e283ccb8cd7518e909240f1e1 /src/xdisp.c | |
| parent | bdd9b5b8a0d37dd09ee530c1dab3a44bee09e0f8 (diff) | |
| parent | ebe334cdc234de2897263aed4c05ac7088c11857 (diff) | |
| download | emacs-scratch/correct-warning-pos.tar.gz emacs-scratch/correct-warning-pos.zip | |
Merge branch 'master' into scratch/correct-warning-posscratch/correct-warning-pos
Diffstat (limited to 'src/xdisp.c')
| -rw-r--r-- | src/xdisp.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/src/xdisp.c b/src/xdisp.c index 977d31703fb..c695e466e78 100644 --- a/src/xdisp.c +++ b/src/xdisp.c | |||
| @@ -19157,7 +19157,8 @@ redisplay_window (Lisp_Object window, bool just_this_one_p) | |||
| 19157 | struct glyph_row *row; | 19157 | struct glyph_row *row; |
| 19158 | 19158 | ||
| 19159 | row = MATRIX_FIRST_TEXT_ROW (w->desired_matrix); | 19159 | row = MATRIX_FIRST_TEXT_ROW (w->desired_matrix); |
| 19160 | while (MATRIX_ROW_BOTTOM_Y (row) < new_vpos) | 19160 | while (MATRIX_ROW_BOTTOM_Y (row) < new_vpos |
| 19161 | && !row->ends_at_zv_p) | ||
| 19161 | ++row; | 19162 | ++row; |
| 19162 | 19163 | ||
| 19163 | TEMP_SET_PT_BOTH (MATRIX_ROW_START_CHARPOS (row), | 19164 | TEMP_SET_PT_BOTH (MATRIX_ROW_START_CHARPOS (row), |