(Fforward_word): Notice field boundaries only if

inhibit-field-text-motion is nil.

1 files changed, 6 insertions, 4 deletions

diff --git a/src/syntax.c b/src/syntax.c
index d08c29bab53..1db16c589f7 100644
--- a/src/syntax.c
+++ b/src/syntax.c
@@ -1222,7 +1222,8 @@ DEFUN ("forward-word", Fforward_word, Sforward_word, 1, 1, "p",
   "Move point forward ARG words (backward if ARG is negative).\n\
 Normally returns t.\n\
 If an edge of the buffer or a field boundary is reached, point is left there\n\
-and the function returns nil.")
+and the function returns nil.  Field boundaries are not noticed if\n\
+`inhibit-field-text-motion' is non-nil.")
   (count)
      Lisp_Object count;
 {
@@ -1234,11 +1235,12 @@ and the function returns nil.")
     val = XINT (count) > 0 ? ZV : BEGV;
 
   /* Avoid jumping out of an input field.  */
-  val = XFASTINT (Fconstrain_to_field (make_number (val), make_number (PT),
-                                       Qt, Qnil));
+  if (NILP (Vinhibit_field_text_motion))
+    val = XFASTINT (Fconstrain_to_field (make_number (val), make_number (PT),
+                                         Qt, Qnil));
 
   SET_PT (val);
-  return (val == orig_val ? Qt : Qnil);
+  return val == orig_val ? Qt : Qnil;
 }
 
 Lisp_Object skip_chars ();