Mercurial > emacs
changeset 54847:5acc1d864551
(update_window): Only set changed_p if
scrolling_window actually did scroll.
(scrolling_window): Only return 1 if we actually did scroll.
| author | Kim F. Storm <storm@cua.dk> |
|---|---|
| date | Tue, 13 Apr 2004 21:30:56 +0000 |
| parents | e8865bfda38b |
| children | 679fb5bfb814 |
| files | src/dispnew.c |
| diffstat | 1 files changed, 9 insertions(+), 7 deletions(-) [+] |
line wrap: on
line diff
--- a/src/dispnew.c Tue Apr 13 21:30:16 2004 +0000 +++ b/src/dispnew.c Tue Apr 13 21:30:56 2004 +0000 @@ -4130,9 +4130,11 @@ goto set_cursor; } else if (rc > 0) - /* We've scrolled the display. */ - force_p = 1; - changed_p = 1; + { + /* We've scrolled the display. */ + force_p = 1; + changed_p = 1; + } } /* Update the rest of the lines. */ @@ -5049,8 +5051,8 @@ for (i = 0; i < row_entry_idx; ++i) row_table[row_entry_pool[i].bucket] = NULL; - /* Value is non-zero to indicate that we scrolled the display. */ - return 1; + /* Value is > 0 to indicate that we scrolled the display. */ + return nruns; } @@ -5909,13 +5911,13 @@ it's the one we were looking for. */ if (area == RIGHT_MARGIN_AREA) x0 = ((WINDOW_HAS_FRINGES_OUTSIDE_MARGINS (w) - ? WINDOW_LEFT_FRINGE_WIDTH (w) + ? WINDOW_LEFT_FRINGE_WIDTH (w) : WINDOW_TOTAL_FRINGE_WIDTH (w)) + window_box_width (w, LEFT_MARGIN_AREA) + window_box_width (w, TEXT_AREA)); else x0 = (WINDOW_HAS_FRINGES_OUTSIDE_MARGINS (w) - ? WINDOW_LEFT_FRINGE_WIDTH (w) + ? WINDOW_LEFT_FRINGE_WIDTH (w) : 0); glyph = row->glyphs[area];