diff --git a/ChangeLog b/ChangeLog
index 179fcdb89458e06a35bc584d86845a0c56a0f471..7952ceb71b60b95f796a53434929a357ef0b0d40 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -38,8 +38,8 @@ CVS code -
 	  file help.c; changes to help_init(), help_line_len(), and
 	  do_help() (all moved to help.c). (DLR)
 	- Tweak a few functions to remove the assumption that the file
-	  always ends in a magicline.  Changes to do_cut_till_end(),
-	  do_next_word(), and do_wordlinechar_count(). (DLR)
+	  always ends in a magicline.  Changes to do_cut_till_end() and
+	  do_wordlinechar_count(). (DLR)
 	- Tweak a few functions to rely on fileage and filebot instead
 	  of NULL for their checks to detect the top or bottom of the
 	  file.  Changes to cut_line(), cut_to_eol(), do_page_up(),
diff --git a/src/move.c b/src/move.c
index fc86a3bcaf27c92358bdf12d3259c79bc7b17617..9e1a85aa6ff95e6ca94ed6000f0c59a7abc15f21 100644
--- a/src/move.c
+++ b/src/move.c
@@ -283,10 +283,8 @@ bool do_next_word(bool allow_punct, bool allow_update)
 
     /* If we haven't found it, leave the cursor at the end of the
      * file. */
-    if (openfile->current == NULL) {
+    if (openfile->current == NULL)
 	openfile->current = openfile->filebot;
-	openfile->current_x = strlen(openfile->filebot->data);
-    }
 
     openfile->placewewant = xplustabs();