diff options
| author | Eli Zaretskii | 2016-02-14 21:20:48 +0200 |
|---|---|---|
| committer | Eli Zaretskii | 2016-02-14 21:20:48 +0200 |
| commit | 84829495b5746417f5eaf9be693fb35f0509697a (patch) | |
| tree | eef48185f0cf99365dc09fc2e13c895a0cee4909 /src | |
| parent | c1313b5f270bb20901423815c23f72e926f7bf38 (diff) | |
| download | emacs-84829495b5746417f5eaf9be693fb35f0509697a.tar.gz emacs-84829495b5746417f5eaf9be693fb35f0509697a.zip | |
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)
Diffstat (limited to 'src')
| -rw-r--r-- | src/xdisp.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/xdisp.c b/src/xdisp.c index 840699d00fb..fed58799eaa 100644 --- a/src/xdisp.c +++ b/src/xdisp.c | |||
| @@ -16920,7 +16920,7 @@ redisplay_window (Lisp_Object window, bool just_this_one_p) | |||
| 16920 | if (scroll_conservatively > SCROLL_LIMIT) | 16920 | if (scroll_conservatively > SCROLL_LIMIT) |
| 16921 | { | 16921 | { |
| 16922 | int window_total_lines | 16922 | int window_total_lines |
| 16923 | = WINDOW_TOTAL_LINES (w) * FRAME_LINE_HEIGHT (f) * frame_line_height; | 16923 | = WINDOW_TOTAL_LINES (w) * FRAME_LINE_HEIGHT (f) / frame_line_height; |
| 16924 | int margin = | 16924 | int margin = |
| 16925 | scroll_margin > 0 | 16925 | scroll_margin > 0 |
| 16926 | ? min (scroll_margin, window_total_lines / 4) | 16926 | ? min (scroll_margin, window_total_lines / 4) |