# HG changeset patch # User Steve Losh # Date 1442507557 0 # Node ID ddcca1ccfdf3f2758433ffe1b6011acb4947f5d5 # Parent db3b3354c94b195e7313d34f69090a6bbfe73601 minor vim stuff diff -r db3b3354c94b -r ddcca1ccfdf3 vim/custom-dictionary.utf-8.add --- a/vim/custom-dictionary.utf-8.add Thu Sep 17 16:32:19 2015 +0000 +++ b/vim/custom-dictionary.utf-8.add Thu Sep 17 16:32:37 2015 +0000 @@ -173,3 +173,4 @@ monopod gmail inline +NLP diff -r db3b3354c94b -r ddcca1ccfdf3 vim/ftplugin/lisp/lispfolding.vim --- a/vim/ftplugin/lisp/lispfolding.vim Thu Sep 17 16:32:19 2015 +0000 +++ b/vim/ftplugin/lisp/lispfolding.vim Thu Sep 17 16:32:37 2015 +0000 @@ -11,6 +11,8 @@ return ">1" elseif getline(v:lnum) =~ '^\s*(defmacro.*\s' return ">1" + elseif getline(v:lnum) =~ '^\s*(defmethod.*\s' + return ">1" elseif getline(v:lnum) =~ '^\s*(defparameter.*\s' return ">1" elseif getline(v:lnum) =~ '^\s*(defvar.*\s' diff -r db3b3354c94b -r ddcca1ccfdf3 vim/vimrc --- a/vim/vimrc Thu Sep 17 16:32:19 2015 +0000 +++ b/vim/vimrc Thu Sep 17 16:32:37 2015 +0000 @@ -1411,6 +1411,9 @@ augroup ft_quickfix au! au Filetype qf setlocal colorcolumn=0 nolist nocursorline nowrap tw=0 + + " vimscript is a joke + au Filetype qf nnoremap :execute "normal! \cr>" augroup END " }}} @@ -2437,7 +2440,12 @@ diffupdate endfunction " }}} command! -nargs=0 HgDiff call s:HgDiff() -nnoremap Hd :HgDiff + +" Diff the current file +nnoremap hd :HgDiff + +" Diff the entire repo +nnoremap hD :Clam hg diff:set ft=diff nowrap function! s:HgBlame() " {{{ let fn = expand('%:p') @@ -2459,7 +2467,16 @@ syncbind endfunction " }}} command! -nargs=0 HgBlame call s:HgBlame() -nnoremap Hb :HgBlame +nnoremap hb :HgBlame + +function! s:HgStatus() " {{{ + Clam hg status +endfunction " }}} +command! -nargs=0 HgStatus call s:HgStatus() +nnoremap hs :HgStatus + +" Bare hg commands +nnoremap h :!hg " }}} " J {{{