aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorEli Zaretskii2020-06-26 16:34:50 +0300
committerEli Zaretskii2020-06-26 16:34:50 +0300
commit5280e118c07d738321f61b3f2bc3cd27a5ac8dbc (patch)
treed5022e5892f021c504d400220c7f6d39031b26e8
parentbb1a9481c9044ced4b7d7f514557b5ab508f80db (diff)
downloademacs-5280e118c07d738321f61b3f2bc3cd27a5ac8dbc.tar.gz
emacs-5280e118c07d738321f61b3f2bc3cd27a5ac8dbc.zip
; * src/xdisp.c (pos_visible_p): Fix last change. (Bug#42039)
-rw-r--r--src/xdisp.c17
1 files changed, 4 insertions, 13 deletions
diff --git a/src/xdisp.c b/src/xdisp.c
index 15901af9a8d..2aff120bc80 100644
--- a/src/xdisp.c
+++ b/src/xdisp.c
@@ -1782,12 +1782,6 @@ pos_visible_p (struct window *w, ptrdiff_t charpos, int *x, int *y,
1782 start_display (&it3, w, top); 1782 start_display (&it3, w, top);
1783 if (start > CHARPOS (top)) 1783 if (start > CHARPOS (top))
1784 move_it_to (&it3, start - 1, -1, -1, -1, MOVE_TO_POS); 1784 move_it_to (&it3, start - 1, -1, -1, -1, MOVE_TO_POS);
1785 /* Record the line-number width, if any. Do it here,
1786 before subsequent calls to start_display etc. reset
1787 the line_number_produced_p flag, and we can no
1788 longer be sure we are not using stale info. */
1789 int lnum_pixel_width =
1790 it3.line_number_produced_p ? it3.lnum_pixel_width : 0;
1791 /* Move forward one more line if the position before 1785 /* Move forward one more line if the position before
1792 the display string is a newline or if it is the 1786 the display string is a newline or if it is the
1793 rightmost character on a line that is 1787 rightmost character on a line that is
@@ -1857,13 +1851,10 @@ pos_visible_p (struct window *w, ptrdiff_t charpos, int *x, int *y,
1857 /* Account for line-number display, if IT3 still 1851 /* Account for line-number display, if IT3 still
1858 didn't. This can happen if START - 1 is the 1852 didn't. This can happen if START - 1 is the
1859 first or the last character on its display line. */ 1853 first or the last character on its display line. */
1860 if (!it3.line_number_produced_p) 1854 if (it3.lnum_pixel_width > 0)
1861 { 1855 top_x += it3.lnum_pixel_width;
1862 if (lnum_pixel_width > 0) 1856 else if (it.line_number_produced_p)
1863 top_x += lnum_pixel_width; 1857 top_x += it.lnum_pixel_width;
1864 else if (it.line_number_produced_p)
1865 top_x += it.lnum_pixel_width;
1866 }
1867 /* Normally, we would exit the above loop because we 1858 /* Normally, we would exit the above loop because we
1868 found the display element whose character 1859 found the display element whose character
1869 position is CHARPOS. For the contingency that we 1860 position is CHARPOS. For the contingency that we