Merge from origin/emacs-26

675edec (origin/emacs-26) Fix some allout.el aliases
b2c069a * lisp/progmodes/ada-mode.el (ada-clean-buffer-before-saving)...
2f5420c Doc fixes re obsolete items
9edf82a Replace an obsolete alias in tpu-mapper
a643792 Doc fixes re obsolete items
3060fb8 Minor changes in mule.texi
3e39897 Avoid assertion violation under visual-order-cursor-movement
e4b73ab Stop mentioning options.el in doc
05669f0 ; * lisp/minibuffer.el (completion-cycle-threshold): Fix last...
758597f * lisp/vc/vc-dir.el (vc-dir-unmark): Fix documentation.
62f0a2b * lisp/minibuffer.el (completion-cycle-threshold): Doc fix.
761845c Fix last change in Xref documentation
5186675 More changes in the Emacs manual
b1aaa72 Improve documentation of Xref

Conflicts:
	lisp/w32-fns.el

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;