diff options
| author | Gerd Moellmann | 2001-08-15 14:57:20 +0000 |
|---|---|---|
| committer | Gerd Moellmann | 2001-08-15 14:57:20 +0000 |
| commit | 288d4e0606fb974057bee798b9a2e7afbb385b12 (patch) | |
| tree | 0b3e07ac6dcb856e66672dc16a958c508b0bccff | |
| parent | 82f053ab598f7e2277836adc474ba8fa29ae6c9d (diff) | |
| download | emacs-288d4e0606fb974057bee798b9a2e7afbb385b12.tar.gz emacs-288d4e0606fb974057bee798b9a2e7afbb385b12.zip | |
(window_scroll_pixel_based): Don't recenter if
PT is partially visible in the window.
| -rw-r--r-- | src/ChangeLog | 3 | ||||
| -rw-r--r-- | src/window.c | 6 |
2 files changed, 7 insertions, 2 deletions
diff --git a/src/ChangeLog b/src/ChangeLog index 1718f06ee99..1f0ab6e89e6 100644 --- a/src/ChangeLog +++ b/src/ChangeLog | |||
| @@ -1,5 +1,8 @@ | |||
| 1 | 2001-08-15 Gerd Moellmann <gerd@gnu.org> | 1 | 2001-08-15 Gerd Moellmann <gerd@gnu.org> |
| 2 | 2 | ||
| 3 | * window.c (window_scroll_pixel_based): Don't recenter if | ||
| 4 | PT is partially visible in the window. | ||
| 5 | |||
| 3 | * xterm.c (expose_window_tree, expose_window, expose_line): Return | 6 | * xterm.c (expose_window_tree, expose_window, expose_line): Return |
| 4 | 1 when overwriting mouse-face. | 7 | 1 when overwriting mouse-face. |
| 5 | (expose_frame): If mouse-face was overwritten, redo it. | 8 | (expose_frame): If mouse-face was overwritten, redo it. |
diff --git a/src/window.c b/src/window.c index abd2e6230ab..95caf878064 100644 --- a/src/window.c +++ b/src/window.c | |||
| @@ -3960,8 +3960,10 @@ window_scroll_pixel_based (window, n, whole, noerror) | |||
| 3960 | SET_TEXT_POS_FROM_MARKER (start, w->start); | 3960 | SET_TEXT_POS_FROM_MARKER (start, w->start); |
| 3961 | 3961 | ||
| 3962 | /* If PT is not visible in WINDOW, move back one half of | 3962 | /* If PT is not visible in WINDOW, move back one half of |
| 3963 | the screen. */ | 3963 | the screen. Allow PT to be partially visible, otherwise |
| 3964 | tem = Fpos_visible_in_window_p (make_number (PT), window, Qnil); | 3964 | something like (scroll-down 1) with PT in the line before |
| 3965 | the partially visible one would recenter. */ | ||
| 3966 | tem = Fpos_visible_in_window_p (make_number (PT), window, Qt); | ||
| 3965 | if (NILP (tem)) | 3967 | if (NILP (tem)) |
| 3966 | { | 3968 | { |
| 3967 | /* Move backward half the height of the window. Performance note: | 3969 | /* Move backward half the height of the window. Performance note: |