Merge branch 'master' of rmz.io:dotfiles

diff --git a/vim/ftplugin/vim.vim b/vim/ftplugin/vim.vim
index 88ab6864a0ba564c930ba5be2dcb53e8f466ba0e..24dd22c57822591e77e5ecc5f785a9edee80ade5 100644 (file)
--- a/vim/ftplugin/vim.vim
+++ b/vim/ftplugin/vim.vim
@@ -1,2 +1 @@
-nnoremap <buffer> K yiw:h \12"<cr>
-vnoremap <buffer> K y:h \12"<cr>
+setlocal keywordprg=:help

diff --git a/zsh/lib/motd.zsh b/zsh/lib/motd.zsh
index 066a96da47f1f8cff90abbab334f504b40367c86..dca1fa217633584b472ad8351c703a892585efe6 100644 (file)
--- a/zsh/lib/motd.zsh
+++ b/zsh/lib/motd.zsh
@@ -13,3 +13,4 @@ msg()
 short "[count][\"x]gr{motion}" 'Replace {motion} text with the contents of register x.'
 short ":Cd" "lcd %:h"
 short ":Cr" "goto git root or home"
+short "gn" "Like \`n\`, but start Visual mode to select the match. If an operator is pending, operates on the match."