diff options
| author | Joakim Verona | 2012-05-21 00:37:29 +0200 |
|---|---|---|
| committer | Joakim Verona | 2012-05-21 00:37:29 +0200 |
| commit | 74f082445c1dd0c92d5bb187db0d50287e3a7bae (patch) | |
| tree | 48e3d8fd9df3876665654eab9bcf96ec492a31e9 /src/window.c | |
| parent | 52862ad482e030e4d54cd7d6e250d76e59ee0554 (diff) | |
| parent | 1b170bc63c2f3a3fbe6ba6996d5a015e82634909 (diff) | |
| download | emacs-74f082445c1dd0c92d5bb187db0d50287e3a7bae.tar.gz emacs-74f082445c1dd0c92d5bb187db0d50287e3a7bae.zip | |
upstream, fix conflicts
Diffstat (limited to 'src/window.c')
| -rw-r--r-- | src/window.c | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/src/window.c b/src/window.c index 710e496fe88..827d3646e49 100644 --- a/src/window.c +++ b/src/window.c | |||
| @@ -4226,6 +4226,11 @@ window_scroll_pixel_based (Lisp_Object window, int n, int whole, int noerror) | |||
| 4226 | void *itdata = NULL; | 4226 | void *itdata = NULL; |
| 4227 | 4227 | ||
| 4228 | SET_TEXT_POS_FROM_MARKER (start, w->start); | 4228 | SET_TEXT_POS_FROM_MARKER (start, w->start); |
| 4229 | /* Scrolling a minibuffer window via scroll bar when the echo area | ||
| 4230 | shows long text sometimes resets the minibuffer contents behind | ||
| 4231 | our backs. */ | ||
| 4232 | if (CHARPOS (start) > ZV) | ||
| 4233 | SET_TEXT_POS (start, BEGV, BEGV_BYTE); | ||
| 4229 | 4234 | ||
| 4230 | /* If PT is not visible in WINDOW, move back one half of | 4235 | /* If PT is not visible in WINDOW, move back one half of |
| 4231 | the screen. Allow PT to be partially visible, otherwise | 4236 | the screen. Allow PT to be partially visible, otherwise |