X-Git-Url: http://www.git.stargrave.org/?a=blobdiff_plain;f=vim%2F.vimrc;h=97f506d8ee02f5e107b3d955bbca9e9477a64abc;hb=bb89ba6b30836733f4454d5b398ed2f41f936167;hp=4ad145e031b42bae5e36c780403a7f2520681047;hpb=47f7d2b5f4a10a65950b0e3d5b07694bb2ce5dfa;p=dotfiles.git

diff --git a/vim/.vimrc b/vim/.vimrc
index 4ad145e..97f506d 100644
--- a/vim/.vimrc
+++ b/vim/.vimrc
@@ -38,7 +38,7 @@ set cursorline
 set cursorcolumn
 set colorcolumn=80
 highlight ExtraWhitespace ctermbg=green ctermfg=blue
-match ExtraWhitespace /^\s*$/
+match ExtraWhitespace /\s\+$/
 
 set relativenumber
 set numberwidth=3
@@ -118,17 +118,6 @@ set formatoptions+=n
 " }}}
 
 autocmd BufEnter * let &titlestring = expand("%:t")
-autocmd BufRead /tmp/mutt-* setlocal textwidth=72
-autocmd BufRead,BufNewFile *.pyi setlocal filetype=python
-autocmd BufRead,BufNewFile *.go setlocal noexpandtab
-autocmd BufRead,BufNewFile *.go let g:defsplit_shift="	"
-autocmd BufNewFile,BufRead *.tex abbreviate framedo \begin{frame}<CR>\frametitle{TODO}<CR>\end{frame}<ESC>k>>wwlcw
-autocmd BufNewFile,BufRead *.tex abbreviate itemdo \begin{itemize}<CR>\item <CR>\end{itemize}<ESC>k>>$a
-autocmd BufNewFile,BufRead *.tex abbreviate cnter \begin{center}<CR>\end{center}<ESC>k$o
-autocmd Filetype texinfo abbreviate \t @tab
-autocmd Filetype gitcommit setlocal textwidth=72
-autocmd BufRead /tmp/psql.edit* setlocal filetype=sql
-autocmd Filetype yaml setlocal shiftwidth=2
 
 set keywordprg=
 
@@ -145,7 +134,6 @@ nmap _ f_l
 
 nmap <leader>] "*yiw
 nmap <leader>p "_diwP
-nmap <leader>o :let @*=expand("%:p")<CR>
 
 nmap ]q :cnext<CR>
 nmap [q :cprev<CR>
@@ -157,6 +145,7 @@ cmap <C-O> <S-Left>
 cmap <C-P> <S-Right>
 
 map Q gq
+map Y y$
 cmap ][ '[,']
 nmap <Tab> :buffers<CR>:buffer<Space>
 nmap <silent> <Home> :registers<CR>
@@ -164,7 +153,7 @@ nmap <leader>' yiwciw"<C-r>""<ESC>
 nmap <leader>h1 yypVr=o
 nmap <leader>72 :set textwidth=72
 nmap <leader>sc 024i-<ESC>a >8 <ESC>24a-<ESC>
-nmap <leader><C-]> :vertical winc ]<CR>
+nmap <leader><C-]> :vertical wincmd ]<CR>
 nnoremap <C-P> <C-I>
 
 nmap <F1> :help!<CR>