diff --git a/inputrc b/inputrc
index 0beaa06..f51b4f7 100644
--- a/inputrc
+++ b/inputrc
@@ -38,3 +38,10 @@ set completion-ignore-case on
 "\e[1;5D": beginning-of-line
 "\e[1;5C": end-of-line
 
+# Control+left/right on Terminal.app
+"\e[5D": beginning-of-line
+"\e[5C": end-of-line
+
+# Option+left/right on Terminal.app
+"\ef":forward-word
+"\eb":backward-word
diff --git a/vim b/vim
index a10a394..0ffd9a6 160000
--- a/vim
+++ b/vim
@@ -1 +1 @@
-Subproject commit a10a3940aa0fae2687b47512f192a252696cc81d
+Subproject commit 0ffd9a6b1cedbf8a3e465513cd63c418a8560a31