emacs-diffs
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

master 9927582: Fix last change in 'try_window'


From: Eli Zaretskii
Subject: master 9927582: Fix last change in 'try_window'
Date: Mon, 3 Aug 2020 10:57:31 -0400 (EDT)

branch: master
commit 99275822c6c36ac308a7b77b5271066df5f38dfb
Author: Eli Zaretskii <eliz@gnu.org>
Commit: Eli Zaretskii <eliz@gnu.org>

    Fix last change in 'try_window'
    
    * src/xdisp.c (try_window): Don't modify the logic when EOB is in
    the viewport.  (Bug#42653)
---
 src/xdisp.c | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/src/xdisp.c b/src/xdisp.c
index a8cd4dc..9f07361 100644
--- a/src/xdisp.c
+++ b/src/xdisp.c
@@ -19234,9 +19234,8 @@ try_window (Lisp_Object window, struct text_pos pos, 
int flags)
             seems to give wrong results.  We don't want to recenter
             when the last line is partly visible, we want to allow
             that case to be handled in the usual way.  */
-         || (it_charpos < ZV   /* if EOB is visible, disable bottom margin */
-             && w->cursor.y > (it.last_visible_y - partial_line_height (&it)
-                               - this_scroll_margin - 1)))
+         || w->cursor.y > (it.last_visible_y - partial_line_height (&it)
+                           - this_scroll_margin - 1))
        {
          w->cursor.vpos = -1;
          clear_glyph_matrix (w->desired_matrix);



reply via email to

[Prev in Thread] Current Thread [Next in Thread]