Merge from origin/emacs-28

c9524819ea Partially revert a fill-region-as-paragraph regression
6075ea0b79 Fix 'make_lispy_position' when there's an image at EOB

# Conflicts:
#	test/lisp/textmodes/fill-tests.el

1 files changed, 2 insertions, 1 deletions

diff --git a/src/xdisp.c b/src/xdisp.c
index 9c0764be690..26bd45a8614 100644
--- a/src/xdisp.c
+++ b/src/xdisp.c
@@ -10216,7 +10216,8 @@ move_it_to (struct it *it, ptrdiff_t to_charpos, int to_x, int to_y, int to_vpos
                          could have both positions after TO_CHARPOS or
                          both positions before it, due to bidi
                          reordering.)  */
-                      if (IT_CHARPOS (*it) != to_charpos
+                      if (to_charpos > 0
+                          && IT_CHARPOS (*it) != to_charpos
                           && ((IT_CHARPOS (it_backup) > to_charpos)
                               == (IT_CHARPOS (*it) > to_charpos)))
                         {