From c85c098af1a822da49168f1774e7e72b513d8075 Mon Sep 17 00:00:00 2001
From: Jeff Jenkins <velo@google.com>
Date: Wed, 1 Jun 2016 07:08:26 -0400
Subject: [PATCH] Use Sublime Text word/subword movement with alt/ctrl

---
 keymap/sublime.js | 15 +++++++++++++--
 1 file changed, 13 insertions(+), 2 deletions(-)

diff --git a/keymap/sublime.js b/keymap/sublime.js
index c1749e7196..fe890afdc5 100644
--- a/keymap/sublime.js
+++ b/keymap/sublime.js
@@ -43,6 +43,15 @@
     return Pos(start.line, pos);
   }
 
+  function moveWord(cm, dir) {
+    cm.extendSelectionsBy(function(range) {
+      if (cm.display.shift || cm.doc.extend || range.empty())
+        return cm.findPosH(range.head, dir, "word");
+      else
+        return dir < 0 ? range.from() : range.to();
+    });
+  }
+
   function moveSubword(cm, dir) {
     cm.extendSelectionsBy(function(range) {
       if (cm.display.shift || cm.doc.extend || range.empty())
@@ -52,8 +61,10 @@
     });
   }
 
-  cmds[map["Alt-Left"] = "goSubwordLeft"] = function(cm) { moveSubword(cm, -1); };
-  cmds[map["Alt-Right"] = "goSubwordRight"] = function(cm) { moveSubword(cm, 1); };
+  cmds[map["Ctrl-Left"] = "goSubwordLeft"] = function(cm) { moveSubword(cm, -1); };
+  cmds[map["Ctrl-Right"] = "goSubwordRight"] = function(cm) { moveSubword(cm, 1); };
+  cmds[map["Alt-Left"] = "goWordLeft"] = function(cm) { moveWord(cm, -1); };
+  cmds[map["Alt-Right"] = "goWordRight"] = function(cm) { moveWord(cm, 1); };
 
   if (mac) map["Cmd-Left"] = "goLineStartSmart";