[vim] various small fixes

1 files changed, 5 insertions, 2 deletions

diff --git a/vimrc b/vimrc
index eb6d241..a79ea56 100644
--- a/vimrc
+++ b/vimrc
@@ -14,7 +14,7 @@ set encoding=utf-8
 set winminheight=0
 set hidden " allows files to be open in invisible buffers
 set wildmenu
-set wildmode=full
+set wildmode=list:longest,full
 set smartcase
 
 " seriously, no backup
@@ -22,6 +22,9 @@ set nobackup
 set nowritebackup
 set noswapfile
 
+" Toggle paste mode on and off with comma p.
+map ,p :se invpaste paste?<return>
+
 set expandtab
 set tabstop=2
 set shiftwidth=2
@@ -54,5 +57,5 @@ au FileType python   setlocal keywordprg=pydoc shiftwidth=2 softtabstop=2 tabsto
 au FileType make     setlocal shiftwidth=8 tabstop=8 noexpandtab
 au FileType markdown setlocal tw=100
 au FileType sh       setlocal shiftwidth=2 softtabstop=2 tabstop=2 tw=80
-au FileType go       setlocal tw=100 noexpandtab tabstop=4 shiftwidth=4 nolist
+au FileType go       setlocal tw=100 noexpandtab tabstop=2 shiftwidth=2 nolist
 au FileType go       autocmd  BufWritePre <buffer> Fmt