diff options
| author | Joakim Verona | 2012-12-12 16:42:23 +0100 |
|---|---|---|
| committer | Joakim Verona | 2012-12-12 16:42:23 +0100 |
| commit | 835350a08a35b0045270154ed0c74e736ba725fe (patch) | |
| tree | 80d47d915cc4fb910dfd88e05541bf16c2031ee8 /src/window.c | |
| parent | 8986f115b01183ffdc4cfc912ba426959266ef1a (diff) | |
| parent | 2dd61a9b332356fa24d96527a71ef4fe29fb9e5c (diff) | |
| download | emacs-835350a08a35b0045270154ed0c74e736ba725fe.tar.gz emacs-835350a08a35b0045270154ed0c74e736ba725fe.zip | |
auto upstream
Diffstat (limited to 'src/window.c')
| -rw-r--r-- | src/window.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/window.c b/src/window.c index 4631a898d3e..3e3cd3a571c 100644 --- a/src/window.c +++ b/src/window.c | |||
| @@ -5351,8 +5351,8 @@ and redisplay normally--don't erase and redraw the frame. */) | |||
| 5351 | iarg += ht; | 5351 | iarg += ht; |
| 5352 | 5352 | ||
| 5353 | /* Don't let it get into the margin at either top or bottom. */ | 5353 | /* Don't let it get into the margin at either top or bottom. */ |
| 5354 | iarg = max (iarg, this_scroll_margin); | 5354 | iarg = clip_to_bounds (this_scroll_margin, iarg, |
| 5355 | iarg = min (iarg, ht - this_scroll_margin - 1); | 5355 | ht - this_scroll_margin - 1); |
| 5356 | 5356 | ||
| 5357 | pos = *vmotion (PT, - iarg, w); | 5357 | pos = *vmotion (PT, - iarg, w); |
| 5358 | charpos = pos.bufpos; | 5358 | charpos = pos.bufpos; |