From 11199de98a2c29601e38e75af561057ab55a0a83 Mon Sep 17 00:00:00 2001
From: Stephen Blott
Date: Sat, 31 Jan 2015 13:01:18 +0000
Subject: Visual/edit modes: change implementation of vimword.

---
 content_scripts/mode_visual_edit.coffee | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

(limited to 'content_scripts')

diff --git a/content_scripts/mode_visual_edit.coffee b/content_scripts/mode_visual_edit.coffee
index d936ac1e..253d892a 100644
--- a/content_scripts/mode_visual_edit.coffee
+++ b/content_scripts/mode_visual_edit.coffee
@@ -124,8 +124,10 @@ class Movement extends CountPrefix
       beforeText[beforeText.length - 1]
 
   # Test whether the character following the focus is a word character.  Leave the selection unchanged.
+  # We include "." as a word character here.  With this, "w" sometimes jumps one word too far.  However, it's
+  # better than leaving it out, in which case "w" jumps backwards!
   nextCharacterIsWordCharacter: do ->
-    regexp = /[A-Za-z0-9_]/
+    regexp = /[A-Za-z0-9_]|\./
     -> regexp.test @getNextForwardCharacter()
 
   # Run a movement.  For convenience, the following three argument forms are available:
@@ -147,7 +149,7 @@ class Movement extends CountPrefix
     # Perform the movement.
     if movement[1] == vimword and movement[0] == forward
       if @nextCharacterIsWordCharacter()
-        @runMovements [ forward, word ], [ forward, vimword ]
+        @runMovements [ forward, word ], [ forward, word ], [ backward, word ]
       else
         @runMovements [ forward, word ], [ backward, word ]
 
-- 
cgit v1.2.3