diff options
| author | Miles Bader | 2006-03-28 23:08:20 +0000 |
|---|---|---|
| committer | Miles Bader | 2006-03-28 23:08:20 +0000 |
| commit | 1ef7e5599f5aa981399221e657ff34e80cc2c1a3 (patch) | |
| tree | 539ff4cf9ea84af29a4e8628d049f3a4253a51f4 /src/window.c | |
| parent | 33bd75ec5fb277e58731c8cbbb942cba4d9a9f19 (diff) | |
| parent | 29314e0fd78063d663bd272787d0ea81cc61e38e (diff) | |
| download | emacs-1ef7e5599f5aa981399221e657ff34e80cc2c1a3.tar.gz emacs-1ef7e5599f5aa981399221e657ff34e80cc2c1a3.zip | |
Revision: emacs@sv.gnu.org/emacs--unicode--0--patch-49
Merge from emacs--devo--0
Patches applied:
* emacs--devo--0 (patch 164-184)
- Update from CVS
- Merge from gnus--rel--5.10
- Update from CVS: man/mh-e.texi (Folders): Various edits.
- Update from erc--emacs--0
* gnus--rel--5.10 (patch 62-70)
- Merge from emacs--devo--0
- Update from CVS
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 d4eaa72f579..039e955efd0 100644 --- a/src/window.c +++ b/src/window.c | |||
| @@ -4796,8 +4796,8 @@ window_scroll_pixel_based (window, n, whole, noerror) | |||
| 4796 | possibility of point becoming "stuck" on a tall line when | 4796 | possibility of point becoming "stuck" on a tall line when |
| 4797 | scrolling by one line. */ | 4797 | scrolling by one line. */ |
| 4798 | if (window_scroll_pixel_based_preserve_y < 0 | 4798 | if (window_scroll_pixel_based_preserve_y < 0 |
| 4799 | || (current_kboard->Vlast_command != Qscroll_up | 4799 | || (!EQ (current_kboard->Vlast_command, Qscroll_up) |
| 4800 | && current_kboard->Vlast_command != Qscroll_down)) | 4800 | && !EQ (current_kboard->Vlast_command, Qscroll_down))) |
| 4801 | { | 4801 | { |
| 4802 | start_display (&it, w, start); | 4802 | start_display (&it, w, start); |
| 4803 | move_it_to (&it, PT, -1, -1, -1, MOVE_TO_POS); | 4803 | move_it_to (&it, PT, -1, -1, -1, MOVE_TO_POS); |