(line-move):

  Pass INHIBIT-CAPTURE-PROPERTY argument to constrain-to-field.
  Pass nil ESCAPE-FROM-EDGE argument to constrain-to-field.

diff --git a/lisp/simple.el b/lisp/simple.el
index 58aa83f5bb28e4bd9c0a90801755da7357f99081..85df4194088283ba540e82a7abaaee6585170e4f 100644 (file)
--- a/lisp/simple.el
+++ b/lisp/simple.el
@@ -2430,7 +2430,8 @@ Outline mode sets this."
       ;; with intangibility and point-motion hooks enabled this time.
       (goto-char opoint)
       (setq inhibit-point-motion-hooks nil)
-      (goto-char (constrain-to-field new opoint t t))
+      (goto-char (constrain-to-field new opoint nil t
+                                    'inhibit-line-move-field-capture))
       ;; If intangibility processing moved us to a different line,
       ;; readjust the horizontal position within the line we ended up at.
       (when (or (< (point) line-beg) (> (point) line-end))
@@ -2445,7 +2446,8 @@ Outline mode sets this."
            (setq new (point)))
        (goto-char (point-min))
        (setq inhibit-point-motion-hooks nil)
-       (goto-char (constrain-to-field new opoint t t))
+       (goto-char (constrain-to-field new opoint nil t
+                                      'inhibit-line-move-field-capture))
        )))
   nil)