Merge branch 'master' into installer-cygwin-support-3

Conflicts:
	tools/install.sh

2 files changed, 26 insertions, 0 deletions

diff --git a/plugins/fancy-ctrl-z/README.md b/plugins/fancy-ctrl-z/README.md
new file mode 100644
index 000000000..a7670fa2c
--- /dev/null
+++ b/plugins/fancy-ctrl-z/README.md
@@ -0,0 +1,14 @@
+# Use Ctrl-Z to switch back to Vim
+
+I frequently need to execute random command in my shell. To achieve it I pause 
+Vim by pressing Ctrl-z, type command and press fg<Enter> to switch back to Vim.
+The fg part really hurt sme. I just wanted to hit Ctrl-z once again to get back 
+to Vim. I could not find a solution, so I developed one on my own that 
+works wonderfully with ZSH
+
+Source: http://sheerun.net/2014/03/21/how-to-boost-your-vim-productivity/
+
+Credits: 
+- original idea by @sheerun
+- added to OMZ by @mbologna
+
diff --git a/plugins/fancy-ctrl-z/fancy-ctrl-z.plugin.zsh b/plugins/fancy-ctrl-z/fancy-ctrl-z.plugin.zsh
new file mode 100644
index 000000000..8ab297913
--- /dev/null
+++ b/plugins/fancy-ctrl-z/fancy-ctrl-z.plugin.zsh
@@ -0,0 +1,12 @@
+fancy-ctrl-z () {
+  if [[ $#BUFFER -eq 0 ]]; then
+    BUFFER="fg"
+    zle accept-line
+  else
+    zle push-input
+    zle clear-screen
+  fi
+}
+zle -N fancy-ctrl-z
+bindkey '^Z' fancy-ctrl-z
+