[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Emacs-diffs] emacs-25 8482949: Fix point movement under 'scroll-conserv
From: |
Eli Zaretskii |
Subject: |
[Emacs-diffs] emacs-25 8482949: Fix point movement under 'scroll-conservatively' |
Date: |
Sun, 14 Feb 2016 19:21:34 +0000 |
branch: emacs-25
commit 84829495b5746417f5eaf9be693fb35f0509697a
Author: Eli Zaretskii <address@hidden>
Commit: Eli Zaretskii <address@hidden>
Fix point movement under 'scroll-conservatively'
* src/xdisp.c (redisplay_window): Correct a typo in computing the
effective number of text lines in a window. (Bug#22637)
---
src/xdisp.c | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/src/xdisp.c b/src/xdisp.c
index 840699d..fed5879 100644
--- a/src/xdisp.c
+++ b/src/xdisp.c
@@ -16920,7 +16920,7 @@ redisplay_window (Lisp_Object window, bool
just_this_one_p)
if (scroll_conservatively > SCROLL_LIMIT)
{
int window_total_lines
- = WINDOW_TOTAL_LINES (w) * FRAME_LINE_HEIGHT (f) *
frame_line_height;
+ = WINDOW_TOTAL_LINES (w) * FRAME_LINE_HEIGHT (f) /
frame_line_height;
int margin =
scroll_margin > 0
? min (scroll_margin, window_total_lines / 4)
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Emacs-diffs] emacs-25 8482949: Fix point movement under 'scroll-conservatively',
Eli Zaretskii <=