diff options
| author | Paul Eggert | 2012-05-25 11:19:24 -0700 |
|---|---|---|
| committer | Paul Eggert | 2012-05-25 11:19:24 -0700 |
| commit | 42b2a986d9d4b7040fb20c90ec0efeffb78e761a (patch) | |
| tree | d38e7bf5307837f2f38982757f088100de18a64e /src/window.c | |
| parent | e4d81efc58695c19154d5f6733d91172b4c3e5b7 (diff) | |
| parent | a8d3cbf75d219d7a249fc0623219511179e959da (diff) | |
| download | emacs-42b2a986d9d4b7040fb20c90ec0efeffb78e761a.tar.gz emacs-42b2a986d9d4b7040fb20c90ec0efeffb78e761a.zip | |
Merge from trunk.
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 19f27ec5320..37bcf64181a 100644 --- a/src/window.c +++ b/src/window.c | |||
| @@ -4223,6 +4223,11 @@ window_scroll_pixel_based (Lisp_Object window, int n, int whole, int noerror) | |||
| 4223 | void *itdata = NULL; | 4223 | void *itdata = NULL; |
| 4224 | 4224 | ||
| 4225 | SET_TEXT_POS_FROM_MARKER (start, w->start); | 4225 | SET_TEXT_POS_FROM_MARKER (start, w->start); |
| 4226 | /* Scrolling a minibuffer window via scroll bar when the echo area | ||
| 4227 | shows long text sometimes resets the minibuffer contents behind | ||
| 4228 | our backs. */ | ||
| 4229 | if (CHARPOS (start) > ZV) | ||
| 4230 | SET_TEXT_POS (start, BEGV, BEGV_BYTE); | ||
| 4226 | 4231 | ||
| 4227 | /* If PT is not visible in WINDOW, move back one half of | 4232 | /* If PT is not visible in WINDOW, move back one half of |
| 4228 | the screen. Allow PT to be partially visible, otherwise | 4233 | the screen. Allow PT to be partially visible, otherwise |