5 files changed, 92 insertions, 132 deletions

diff --git a/src/ChangeLog b/src/ChangeLog
index cf73204c55c..88df9f13762 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,5 +1,26 @@
 2013-08-14  Dmitry Antipov  <dmantipov@yandex.ru>
 
+        * xdisp.c (adjust_window_ends): Move duplicated code to new function.
+        (try_window, try_window_reusing_current_matrix, try_window_id): Use it.
+
+2013-08-14  Dmitry Antipov  <dmantipov@yandex.ru>
+
+        * window.h (struct window): Convert window_end_pos and
+        window_end_vpos from Lisp_Object to ptrdiff_t and int, respectively.
+        (wset_window_end_pos, wset_window_end_vpos): Remove.
+        * dispnew.c (adjust_glyph_matrix):
+        * window.c (Fwindow_end, replace_window, set_window_buffer)
+        (make_window):
+        * xdisp.c (check_window_end, move_it_to, redisplay_internal)
+        (set_vertical_scroll_bar, redisplay_window, try_window)
+        (try_window_reusing_current_matrix, find_first_unchanged_at_end_row)
+        (try_window_id, decode_mode_spec, mouse_face_from_buffer_pos)
+        (note_mouse_highlight): Adjust users.
+        (try_cursor_movement): Likewise.  Convert old precondition to eassert.
+        Add comment.
+
+2013-08-14  Dmitry Antipov  <dmantipov@yandex.ru>
+
         Fix --enable-gcc-warnings errors introduced in 2013-08-13 commit.
         * image.c (imagemagick_filename_hint): Use `const char *' and
         prefer SSDATA to SDATA to avoid warnings.
diff --git a/src/dispnew.c b/src/dispnew.c
index cb38726ba2d..54d7a7461a0 100644
--- a/src/dispnew.c
+++ b/src/dispnew.c
@@ -600,8 +600,7 @@ adjust_glyph_matrix (struct window *w, struct glyph_matrix *matrix, int x, int y
 
               /* Window end is invalid, if inside of the rows that
                  are invalidated below.  */
-              if (INTEGERP (w->window_end_vpos)
-                  && XFASTINT (w->window_end_vpos) >= i)
+              if (w->window_end_vpos >= i)
                 w->window_end_valid = 0;
 
               while (i < matrix->nrows)
diff --git a/src/window.c b/src/window.c
index c61a02aeb01..887c3a92ab7 100644
--- a/src/window.c
+++ b/src/window.c
@@ -1542,7 +1542,7 @@ if it isn't already recorded.  */)
         set_buffer_internal (old_buffer);
     }
   else
-    XSETINT (value, BUF_Z (b) - XFASTINT (w->window_end_pos));
+    XSETINT (value, BUF_Z (b) - w->window_end_pos);
 
   return value;
 }
@@ -2036,8 +2036,8 @@ replace_window (Lisp_Object old, Lisp_Object new, int setflag)
       n->phys_cursor_width = -1;
       n->must_be_updated_p = 0;
       n->pseudo_window_p = 0;
-      wset_window_end_vpos (n, make_number (0));
-      wset_window_end_pos (n, make_number (0));
+      n->window_end_vpos = 0;
+      n->window_end_pos = 0;
       n->window_end_valid = 0;
     }
 
@@ -3173,8 +3173,8 @@ set_window_buffer (Lisp_Object window, Lisp_Object buffer,
     bset_display_count (b, make_number (XINT (BVAR (b, display_count)) + 1));
   bset_display_time (b, Fcurrent_time ());
 
-  wset_window_end_pos (w, make_number (0));
-  wset_window_end_vpos (w, make_number (0));
+  w->window_end_pos = 0;
+  w->window_end_vpos = 0;
   memset (&w->last_cursor, 0, sizeof w->last_cursor);
 
   if (!(keep_margins_p && samebuf))
@@ -3440,8 +3440,6 @@ make_window (void)
   wset_start (w, Fmake_marker ());
   wset_pointm (w, Fmake_marker ());
   wset_vertical_scroll_bar_type (w, Qt);
-  wset_window_end_pos (w, make_number (0));
-  wset_window_end_vpos (w, make_number (0));
   /* These Lisp fields are marked specially so they're not set to nil by
      allocate_window.  */
   wset_prev_buffers (w, Qnil);
diff --git a/src/window.h b/src/window.h
index 823fe678c43..585697f0805 100644
--- a/src/window.h
+++ b/src/window.h
@@ -145,14 +145,6 @@ struct window
        no scroll bar.  A value of t means use frame value.  */
     Lisp_Object vertical_scroll_bar_type;
 
-    /* Z - the buffer position of the last glyph in the current
-       matrix of W.  Only valid if window_end_valid is nonzero.  */
-    Lisp_Object window_end_pos;
-
-    /* Glyph matrix row of the last glyph in the current matrix
-       of W.  Only valid if window_end_valid is nonzero.  */
-    Lisp_Object window_end_vpos;
-
     /* Display-table to use for displaying chars in this window.
        Nil means use the buffer's own display-table.  */
     Lisp_Object display_table;
@@ -269,6 +261,14 @@ struct window
        A value of -1 means use frame values.  */
     int scroll_bar_width;
 
+    /* Z - the buffer position of the last glyph in the current
+       matrix of W.  Only valid if window_end_valid is nonzero.  */
+    ptrdiff_t window_end_pos;
+
+    /* Glyph matrix row of the last glyph in the current matrix
+       of W.  Only valid if window_end_valid is nonzero.  */
+    int window_end_vpos;
+
     /* Non-zero if this window is a minibuffer window.  */
     unsigned mini : 1;
 
@@ -366,16 +366,6 @@ wset_vertical_scroll_bar (struct window *w, Lisp_Object val)
   w->vertical_scroll_bar = val;
 }
 WINDOW_INLINE void
-wset_window_end_pos (struct window *w, Lisp_Object val)
-{
-  w->window_end_pos = val;
-}
-WINDOW_INLINE void
-wset_window_end_vpos (struct window *w, Lisp_Object val)
-{
-  w->window_end_vpos = val;
-}
-WINDOW_INLINE void
 wset_prev_buffers (struct window *w, Lisp_Object val)
 {
   w->prev_buffers = val;
diff --git a/src/xdisp.c b/src/xdisp.c
index 490c1f3440f..b30d9d57578 100644
--- a/src/xdisp.c
+++ b/src/xdisp.c
@@ -2468,7 +2468,16 @@ remember_mouse_glyph (struct frame *f, int gx, int gy, NativeRectangle *rect)
 
 #endif /* HAVE_WINDOW_SYSTEM */
 
-
+static void
+adjust_window_ends (struct window *w, struct glyph_row *row, bool current)
+{
+  eassert (w);
+  w->window_end_pos = Z - MATRIX_ROW_END_CHARPOS (row);
+  w->window_end_bytepos = Z_BYTE - MATRIX_ROW_END_BYTEPOS (row);
+  w->window_end_vpos
+    = MATRIX_ROW_VPOS (row, current ? w->current_matrix : w->desired_matrix);
+}
+
 /***********************************************************************
                         Lisp form evaluation
  ***********************************************************************/
@@ -2604,8 +2613,7 @@ check_window_end (struct window *w)
   if (!MINI_WINDOW_P (w) && w->window_end_valid)
     {
       struct glyph_row *row;
-      eassert ((row = MATRIX_ROW (w->current_matrix,
-                                  XFASTINT (w->window_end_vpos)),
+      eassert ((row = MATRIX_ROW (w->current_matrix, w->window_end_vpos),
                 !row->enabled_p
                 || MATRIX_ROW_DISPLAYS_TEXT_P (row)
                 || MATRIX_ROW_VPOS (row, w->current_matrix) == 0));
@@ -9110,7 +9118,7 @@ move_it_to (struct it *it, ptrdiff_t to_charpos, int to_x, int to_y, int to_vpos
       && it->current_x == it->last_visible_x - 1
       && it->c != '\n'
       && it->c != '\t'
-      && it->vpos < XFASTINT (it->w->window_end_vpos))
+      && it->vpos < it->w->window_end_vpos)
     {
       it->continuation_lines_width += it->current_x;
       it->current_x = it->hpos = it->max_ascent = it->max_descent = 0;
@@ -13324,12 +13332,12 @@ redisplay_internal (void)
                  adjusted.  */
               if (MATRIX_ROW_DISPLAYS_TEXT_P (it.glyph_row - 1))
                 {
-                  if (XFASTINT (w->window_end_vpos) < this_line_vpos)
-                    wset_window_end_vpos (w, make_number (this_line_vpos));
+                  if (w->window_end_vpos < this_line_vpos)
+                    w->window_end_vpos = this_line_vpos;
                 }
-              else if (XFASTINT (w->window_end_vpos) == this_line_vpos
+              else if (w->window_end_vpos == this_line_vpos
                        && this_line_vpos > 0)
-                wset_window_end_vpos (w, make_number (this_line_vpos - 1));
+                w->window_end_vpos = this_line_vpos - 1;
               w->window_end_valid = 0;
 
               /* Update hint: No need to try to scroll in update_window.  */
@@ -15019,6 +15027,10 @@ try_cursor_movement (Lisp_Object window, struct text_pos startp, int *scroll_ste
      if-statement below. Now, this field is converted to
      ptrdiff_t, thus zero means invalid position in a buffer.  */
   eassert (w->last_point > 0);
+  /* Likewise there was a check whether window_end_vpos is nil or larger
+     than the window.  Now window_end_vpos is int and so never nil, but
+     let's leave eassert to check whether it fits in the window.  */
+  eassert (w->window_end_vpos < w->current_matrix->nrows);
 
   /* Handle case where text has not changed, only point, and it has
      not moved off the frame.  */
@@ -15046,13 +15058,6 @@ try_cursor_movement (Lisp_Object window, struct text_pos startp, int *scroll_ste
          since the handling of this_line_start_pos, etc., in redisplay
          handles the same cases.  */
       && !EQ (window, minibuf_window)
-      /* When splitting windows or for new windows, it happens that
-         redisplay is called with a nil window_end_vpos or one being
-         larger than the window.  This should really be fixed in
-         window.c.  I don't have this on my list, now, so we do
-         approximately the same as the old redisplay code.  --gerd.  */
-      && INTEGERP (w->window_end_vpos)
-      && XFASTINT (w->window_end_vpos) < w->current_matrix->nrows
       && (FRAME_WINDOW_P (f)
           || !overlay_arrow_in_current_buffer_p ()))
     {
@@ -15366,7 +15371,7 @@ set_vertical_scroll_bar (struct window *w)
       start = marker_position (w->start) - BUF_BEGV (buf);
       /* I don't think this is guaranteed to be right.  For the
          moment, we'll pretend it is.  */
-      end = BUF_Z (buf) - XFASTINT (w->window_end_pos) - BUF_BEGV (buf);
+      end = BUF_Z (buf) - w->window_end_pos - BUF_BEGV (buf);
 
       if (end < start)
         end = start;
@@ -16056,7 +16061,7 @@ redisplay_window (Lisp_Object window, int just_this_one_p)
      line.)  */
   if (w->cursor.vpos < 0)
     {
-      if (w->window_end_valid && PT >= Z - XFASTINT (w->window_end_pos))
+      if (w->window_end_valid && PT >= Z - w->window_end_pos)
         {
           clear_glyph_matrix (w->desired_matrix);
           move_it_by_lines (&it, 1);
@@ -16356,8 +16361,7 @@ try_window (Lisp_Object window, struct text_pos pos, int flags)
     }
 
   /* If bottom moved off end of frame, change mode line percentage.  */
-  if (XFASTINT (w->window_end_pos) <= 0
-      && Z != IT_CHARPOS (it))
+  if (w->window_end_pos <= 0 && Z != IT_CHARPOS (it))
     w->update_mode_line = 1;
 
   /* Set window_end_pos to the offset of the last character displayed
@@ -16366,21 +16370,16 @@ try_window (Lisp_Object window, struct text_pos pos, int flags)
   if (last_text_row)
     {
       eassert (MATRIX_ROW_DISPLAYS_TEXT_P (last_text_row));
-      w->window_end_bytepos
-        = Z_BYTE - MATRIX_ROW_END_BYTEPOS (last_text_row);
-      wset_window_end_pos
-        (w, make_number (Z - MATRIX_ROW_END_CHARPOS (last_text_row)));
-      wset_window_end_vpos
-        (w, make_number (MATRIX_ROW_VPOS (last_text_row, w->desired_matrix)));
+      adjust_window_ends (w, last_text_row, 0);
       eassert
         (MATRIX_ROW_DISPLAYS_TEXT_P (MATRIX_ROW (w->desired_matrix,
-                                                 XFASTINT (w->window_end_vpos))));
+                                                 w->window_end_vpos)));
     }
   else
     {
       w->window_end_bytepos = Z_BYTE - ZV_BYTE;
-      wset_window_end_pos (w, make_number (Z - ZV));
-      wset_window_end_vpos (w, make_number (0));
+      w->window_end_pos = Z - ZV;
+      w->window_end_vpos = 0;
     }
 
   /* But that is not valid info until redisplay finishes.  */
@@ -16611,32 +16610,15 @@ try_window_reusing_current_matrix (struct window *w)
          The value of last_text_row is the last displayed line
          containing text.  */
       if (last_reused_text_row)
-        {
-          w->window_end_bytepos
-            = Z_BYTE - MATRIX_ROW_END_BYTEPOS (last_reused_text_row);
-          wset_window_end_pos
-            (w, make_number (Z
-                             - MATRIX_ROW_END_CHARPOS (last_reused_text_row)));
-          wset_window_end_vpos
-            (w, make_number (MATRIX_ROW_VPOS (last_reused_text_row,
-                                              w->current_matrix)));
-        }
+        adjust_window_ends (w, last_reused_text_row, 1);
       else if (last_text_row)
-        {
-          w->window_end_bytepos
-            = Z_BYTE - MATRIX_ROW_END_BYTEPOS (last_text_row);
-          wset_window_end_pos
-            (w, make_number (Z - MATRIX_ROW_END_CHARPOS (last_text_row)));
-          wset_window_end_vpos
-            (w, make_number (MATRIX_ROW_VPOS (last_text_row,
-                                              w->desired_matrix)));
-        }
+        adjust_window_ends (w, last_text_row, 0);
       else
         {
           /* This window must be completely empty.  */
           w->window_end_bytepos = Z_BYTE - ZV_BYTE;
-          wset_window_end_pos (w, make_number (Z - ZV));
-          wset_window_end_vpos (w, make_number (0));
+          w->window_end_pos = Z - ZV;
+          w->window_end_vpos = 0;
         }
       w->window_end_valid = 0;
 
@@ -16821,20 +16803,9 @@ try_window_reusing_current_matrix (struct window *w)
          the window end is in reused rows which in turn means that
          only its vpos can have changed.  */
       if (last_text_row)
-        {
-          w->window_end_bytepos
-            = Z_BYTE - MATRIX_ROW_END_BYTEPOS (last_text_row);
-          wset_window_end_pos
-            (w, make_number (Z - MATRIX_ROW_END_CHARPOS (last_text_row)));
-          wset_window_end_vpos
-            (w, make_number (MATRIX_ROW_VPOS (last_text_row,
-                                              w->desired_matrix)));
-        }
+        adjust_window_ends (w, last_text_row, 0);
       else
-        {
-          wset_window_end_vpos
-            (w, make_number (XFASTINT (w->window_end_vpos) - nrows_scrolled));
-        }
+        w->window_end_vpos -= nrows_scrolled;
 
       w->window_end_valid = 0;
       w->desired_matrix->no_scrolling_p = 1;
@@ -16974,11 +16945,11 @@ find_first_unchanged_at_end_row (struct window *w,
   /* A value of window_end_pos >= END_UNCHANGED means that the window
      end is in the range of changed text.  If so, there is no
      unchanged row at the end of W's current matrix.  */
-  if (XFASTINT (w->window_end_pos) >= END_UNCHANGED)
+  if (w->window_end_pos >= END_UNCHANGED)
     return NULL;
 
   /* Set row to the last row in W's current matrix displaying text.  */
-  row = MATRIX_ROW (w->current_matrix, XFASTINT (w->window_end_vpos));
+  row = MATRIX_ROW (w->current_matrix, w->window_end_vpos);
 
   /* If matrix is entirely empty, no unchanged row exists.  */
   if (MATRIX_ROW_DISPLAYS_TEXT_P (row))
@@ -16989,7 +16960,7 @@ find_first_unchanged_at_end_row (struct window *w,
          buffer positions in the current matrix to current buffer
          positions for characters not in changed text.  */
       ptrdiff_t Z_old =
-        MATRIX_ROW_END_CHARPOS (row) + XFASTINT (w->window_end_pos);
+        MATRIX_ROW_END_CHARPOS (row) + w->window_end_pos;
       ptrdiff_t Z_BYTE_old =
         MATRIX_ROW_END_BYTEPOS (row) + w->window_end_bytepos;
       ptrdiff_t last_unchanged_pos, last_unchanged_pos_old;
@@ -17330,7 +17301,7 @@ try_window_id (struct window *w)
      This case happens with stealth-fontification.  Note that although
      the display is unchanged, glyph positions in the matrix have to
      be adjusted, of course.  */
-  row = MATRIX_ROW (w->current_matrix, XFASTINT (w->window_end_vpos));
+  row = MATRIX_ROW (w->current_matrix, w->window_end_vpos);
   if (MATRIX_ROW_DISPLAYS_TEXT_P (row)
       && ((last_changed_charpos < CHARPOS (start)
            && CHARPOS (start) == BEGV)
@@ -17342,7 +17313,7 @@ try_window_id (struct window *w)
 
       /* Compute how many chars/bytes have been added to or removed
          from the buffer.  */
-      Z_old = MATRIX_ROW_END_CHARPOS (row) + XFASTINT (w->window_end_pos);
+      Z_old = MATRIX_ROW_END_CHARPOS (row) + w->window_end_pos;
       Z_BYTE_old = MATRIX_ROW_END_BYTEPOS (row) + w->window_end_bytepos;
       Z_delta = Z - Z_old;
       Z_delta_bytes = Z_BYTE - Z_BYTE_old;
@@ -17413,10 +17384,8 @@ try_window_id (struct window *w)
         {
           /* We have to compute the window end anew since text
              could have been added/removed after it.  */
-          wset_window_end_pos
-            (w, make_number (Z - MATRIX_ROW_END_CHARPOS (row)));
-          w->window_end_bytepos
-            = Z_BYTE - MATRIX_ROW_END_BYTEPOS (row);
+          w->window_end_pos = Z - MATRIX_ROW_END_CHARPOS (row);
+          w->window_end_bytepos = Z_BYTE - MATRIX_ROW_END_BYTEPOS (row);
 
           /* Set the cursor.  */
           row = row_containing_pos (w, PT, r0, NULL, 0);
@@ -17449,7 +17418,7 @@ try_window_id (struct window *w)
 
   /* Give up if the window ends in strings.  Overlay strings
      at the end are difficult to handle, so don't try.  */
-  row = MATRIX_ROW (current_matrix, XFASTINT (w->window_end_vpos));
+  row = MATRIX_ROW (current_matrix, w->window_end_vpos);
   if (MATRIX_ROW_START_CHARPOS (row) == MATRIX_ROW_END_CHARPOS (row))
     GIVE_UP (20);
 
@@ -17795,7 +17764,7 @@ try_window_id (struct window *w)
       /* Set last_row to the glyph row in the current matrix where the
          window end line is found.  It has been moved up or down in
          the matrix by dvpos.  */
-      int last_vpos = XFASTINT (w->window_end_vpos) + dvpos;
+      int last_vpos = w->window_end_vpos + dvpos;
       struct glyph_row *last_row = MATRIX_ROW (current_matrix, last_vpos);
 
       /* If last_row is the window end line, it should display text.  */
@@ -17839,8 +17808,7 @@ try_window_id (struct window *w)
     }
 
   /* Update window_end_pos and window_end_vpos.  */
-  if (first_unchanged_at_end_row
-      && !last_text_row_at_end)
+  if (first_unchanged_at_end_row && !last_text_row_at_end)
     {
       /* Window end line if one of the preserved rows from the current
          matrix.  Set row to the last row displaying text in current
@@ -17850,23 +17818,13 @@ try_window_id (struct window *w)
       row = find_last_row_displaying_text (w->current_matrix, &it,
                                            first_unchanged_at_end_row);
       eassert (row && MATRIX_ROW_DISPLAYS_TEXT_P (row));
-
-      wset_window_end_pos (w, make_number (Z - MATRIX_ROW_END_CHARPOS (row)));
-      w->window_end_bytepos = Z_BYTE - MATRIX_ROW_END_BYTEPOS (row);
-      wset_window_end_vpos
-        (w, make_number (MATRIX_ROW_VPOS (row, w->current_matrix)));
+      adjust_window_ends (w, row, 1);
       eassert (w->window_end_bytepos >= 0);
       IF_DEBUG (debug_method_add (w, "A"));
     }
   else if (last_text_row_at_end)
     {
-      wset_window_end_pos
-        (w, make_number (Z - MATRIX_ROW_END_CHARPOS (last_text_row_at_end)));
-      w->window_end_bytepos
-        = Z_BYTE - MATRIX_ROW_END_BYTEPOS (last_text_row_at_end);
-      wset_window_end_vpos
-        (w, make_number (MATRIX_ROW_VPOS (last_text_row_at_end,
-                                          desired_matrix)));
+      adjust_window_ends (w, last_text_row_at_end, 0);
       eassert (w->window_end_bytepos >= 0);
       IF_DEBUG (debug_method_add (w, "B"));
     }
@@ -17875,12 +17833,7 @@ try_window_id (struct window *w)
       /* We have displayed either to the end of the window or at the
          end of the window, i.e. the last row with text is to be found
          in the desired matrix.  */
-      wset_window_end_pos
-        (w, make_number (Z - MATRIX_ROW_END_CHARPOS (last_text_row)));
-      w->window_end_bytepos
-        = Z_BYTE - MATRIX_ROW_END_BYTEPOS (last_text_row);
-      wset_window_end_vpos
-        (w, make_number (MATRIX_ROW_VPOS (last_text_row, desired_matrix)));
+      adjust_window_ends (w, last_text_row, 0);
       eassert (w->window_end_bytepos >= 0);
     }
   else if (first_unchanged_at_end_row == NULL
@@ -17890,7 +17843,7 @@ try_window_id (struct window *w)
       /* Displayed to end of window, but no line containing text was
          displayed.  Lines were deleted at the end of the window.  */
       int first_vpos = WINDOW_WANTS_HEADER_LINE_P (w) ? 1 : 0;
-      int vpos = XFASTINT (w->window_end_vpos);
+      int vpos = w->window_end_vpos;
       struct glyph_row *current_row = current_matrix->rows + vpos;
       struct glyph_row *desired_row = desired_matrix->rows + vpos;
 
@@ -17908,8 +17861,8 @@ try_window_id (struct window *w)
         }
 
       eassert (row != NULL);
-      wset_window_end_vpos (w, make_number (vpos + 1));
-      wset_window_end_pos (w, make_number (Z - MATRIX_ROW_END_CHARPOS (row)));
+      w->window_end_vpos = vpos + 1;
+      w->window_end_pos = Z - MATRIX_ROW_END_CHARPOS (row);
       w->window_end_bytepos = Z_BYTE - MATRIX_ROW_END_BYTEPOS (row);
       eassert (w->window_end_bytepos >= 0);
       IF_DEBUG (debug_method_add (w, "C"));
@@ -17917,8 +17870,8 @@ try_window_id (struct window *w)
   else
     emacs_abort ();
 
-  IF_DEBUG (debug_end_pos = XFASTINT (w->window_end_pos);
-            debug_end_vpos = XFASTINT (w->window_end_vpos));
+  IF_DEBUG (debug_end_pos = w->window_end_pos;
+            debug_end_vpos = w->window_end_vpos);
 
   /* Record that display has not been completed.  */
   w->window_end_valid = 0;
@@ -22109,7 +22062,7 @@ decode_mode_spec (struct window *w, register int c, int field_width,
         ptrdiff_t pos = marker_position (w->start);
         ptrdiff_t total = BUF_ZV (b) - BUF_BEGV (b);
 
-        if (XFASTINT (w->window_end_pos) <= BUF_Z (b) - BUF_ZV (b))
+        if (w->window_end_pos <= BUF_Z (b) - BUF_ZV (b))
           {
             if (pos <= BUF_BEGV (b))
               return "All";
@@ -22138,7 +22091,7 @@ decode_mode_spec (struct window *w, register int c, int field_width,
     case 'P':
       {
         ptrdiff_t toppos = marker_position (w->start);
-        ptrdiff_t botpos = BUF_Z (b) - XFASTINT (w->window_end_pos);
+        ptrdiff_t botpos = BUF_Z (b) - w->window_end_pos;
         ptrdiff_t total = BUF_ZV (b) - BUF_BEGV (b);
 
         if (botpos >= BUF_ZV (b))
@@ -27294,7 +27247,7 @@ mouse_face_from_buffer_pos (Lisp_Object window,
   /* Find the rows corresponding to START_CHARPOS and END_CHARPOS.  */
   rows_from_pos_range (w, start_charpos, end_charpos, disp_string, &r1, &r2);
   if (r1 == NULL)
-    r1 = MATRIX_ROW (w->current_matrix, XFASTINT (w->window_end_vpos));
+    r1 = MATRIX_ROW (w->current_matrix, w->window_end_vpos);
   /* If the before-string or display-string contains newlines,
      rows_from_pos_range skips to its last row.  Move back.  */
   if (!NILP (before_string) || !NILP (disp_string))
@@ -27316,7 +27269,7 @@ mouse_face_from_buffer_pos (Lisp_Object window,
     }
   if (r2 == NULL)
     {
-      r2 = MATRIX_ROW (w->current_matrix, XFASTINT (w->window_end_vpos));
+      r2 = MATRIX_ROW (w->current_matrix, w->window_end_vpos);
       hlinfo->mouse_face_past_end = 1;
     }
   else if (!NILP (after_string))
@@ -27324,7 +27277,7 @@ mouse_face_from_buffer_pos (Lisp_Object window,
       /* If the after-string has newlines, advance to its last row.  */
       struct glyph_row *next;
       struct glyph_row *last
-        = MATRIX_ROW (w->current_matrix, XFASTINT (w->window_end_vpos));
+        = MATRIX_ROW (w->current_matrix, w->window_end_vpos);
 
       for (next = r2 + 1;
            next <= last
@@ -28630,8 +28583,7 @@ note_mouse_highlight (struct frame *f, int x, int y)
                     : Qnil;
                   Lisp_Object lim2 =
                     NILP (BVAR (XBUFFER (buffer), bidi_display_reordering))
-                    ? make_number (BUF_Z (XBUFFER (buffer))
-                                   - XFASTINT (w->window_end_pos))
+                    ? make_number (BUF_Z (XBUFFER (buffer)) - w->window_end_pos)
                     : Qnil;
 
                   if (NILP (overlay))