1 files changed, 3 insertions, 3 deletions

diff --git a/src/xdisp.c b/src/xdisp.c
index eb1a7d75fca..dd10551d5fa 100644
--- a/src/xdisp.c
+++ b/src/xdisp.c
@@ -20775,7 +20775,7 @@ fast_find_position (w, charpos, hpos, vpos, x, y, stop)
      have a STOP object and previous row's end glyph came from STOP.  */
   if (!NILP (stop))
     {
-      struct glyph_row *prev = row-1;
+      struct glyph_row *prev;
       while ((prev = row - 1, prev >= first)
              && MATRIX_ROW_END_CHARPOS (prev) == charpos
              && prev->used[TEXT_AREA] > 0)
@@ -20784,8 +20784,8 @@ fast_find_position (w, charpos, hpos, vpos, x, y, stop)
           glyph = end + prev->used[TEXT_AREA];
           while (--glyph >= end
                  && INTEGERP (glyph->object));
-          if (glyph >= end
-              && !EQ (stop, glyph->object))
+          if (glyph < end
+              || !EQ (stop, glyph->object))
             break;
           row = prev;
         }