From 2872a98b2b6e5b99c2c460db76f051132d5ea908 Mon Sep 17 00:00:00 2001
From: Maxim Gonchar <gmaxfl@gmail.com>
Date: Wed, 9 Apr 2014 20:59:58 +0400
Subject: [PATCH] Set fish_vi_key_bindings to start in insert mode by default

Add optional argument for fish_vi_key_bindings to set desired initial
mode:
> fish_vi_key_bindings default
---
 share/functions/fish_vi_key_bindings.fish | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/share/functions/fish_vi_key_bindings.fish b/share/functions/fish_vi_key_bindings.fish
index d92cbc49d..11139e11c 100644
--- a/share/functions/fish_vi_key_bindings.fish
+++ b/share/functions/fish_vi_key_bindings.fish
@@ -1,5 +1,10 @@
-function fish_vi_key_bindings -d "vi-like key bindings for fish"
+function fish_vi_key_bindings --description 'vi-like key bindings for fish'
   bind --erase --all
+  set -l init_mode insert
+  if set -q argv[1]
+    set init_mode $argv[1]
+  end
+
 
   ##
   ## command mode
@@ -214,4 +219,5 @@ function fish_vi_key_bindings -d "vi-like key bindings for fish"
   bind -M visual -m default \cc end-selection force-repaint
   bind -M visual -m default \e  end-selection force-repaint
 
+  set fish_bind_mode $init_mode
 end