1 files changed, 5 insertions, 0 deletions

diff --git a/src/xdisp.c b/src/xdisp.c
index 693e273eb07..c0fdeca4847 100644
--- a/src/xdisp.c
+++ b/src/xdisp.c
@@ -22488,6 +22488,11 @@ Value is the new character position of point.  */)
                     new_pos += (row->reversed_p ? -dir : dir);
                   else
                     new_pos -= (row->reversed_p ? -dir : dir);
+                  new_pos = clip_to_bounds (BEGV, new_pos, ZV);
+                  /* If we didn't move, we've hit BEGV or ZV, so we
+                     need to signal a suitable error.  */
+                  if (new_pos == PT)
+                    break;
                 }
               else if (BUFFERP (g->object))
                 new_pos = g->charpos;