Mercurial > emacs
diff src/dispnew.c @ 83098:0643dc72a250
Merged in changes from CVS trunk.
Patches applied:
* miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-213
Update from CVS
* miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-214
Update from CVS
* miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-215
Update from CVS
* miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-216
Update from CVS
* miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-217
Update from CVS
git-archimport-id: lorentey@elte.hu--2004/emacs--multi-tty--0--patch-138
| author | Karoly Lorentey <lorentey@elte.hu> |
|---|---|
| date | Thu, 15 Apr 2004 16:49:22 +0000 |
| parents | 72c2a3eb27da 5acc1d864551 |
| children | 4970ad4995f5 |
line wrap: on
line diff
--- a/src/dispnew.c Tue Apr 13 18:18:05 2004 +0000 +++ b/src/dispnew.c Thu Apr 15 16:49:22 2004 +0000 @@ -4132,9 +4132,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. */ @@ -5056,8 +5058,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; } @@ -5919,13 +5921,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];