1 files changed, 4 insertions, 2 deletions
diff --git a/src/nvim/normal.c b/src/nvim/normal.c
index 92b1cf2d55..d010b4b3a7 100644
--- a/src/nvim/normal.c
+++ b/src/nvim/normal.c
@@ -7193,8 +7193,10 @@ static void nv_wordcmd(cmdarg_T *cap)
       // Another strangeness: When standing on the end of a word "ce" will
       // change until the end of the next word, but "cw" will change only one
       // character!  This is done by setting "flag".
-      cap->oap->inclusive = true;
-      word_end = true;
+      if (vim_strchr(p_cpo, CPO_CHANGEW) != NULL) {
+        cap->oap->inclusive = true;
+        word_end = true;
+      }
       flag = true;
     }
   }