From: Eli Zaretskii <eliz@gnu.org>
Date: Mon, 3 Aug 2020 14:56:40 +0000 (+0300)
Subject: Fix last change in 'try_window'
X-Git-Tag: emacs-28.0.90~6849
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=99275822c6c36ac308a7b77b5271066df5f38dfb;p=emacs.git

Fix last change in 'try_window'

* src/xdisp.c (try_window): Don't modify the logic when EOB is in
the viewport.  (Bug#42653)
---

diff --git a/src/xdisp.c b/src/xdisp.c
index a8cd4dc853c..9f07361d48b 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);