ddcca1ccfdf3

minor vim stuff
[view raw] [browse files]
author Steve Losh <steve@stevelosh.com>
date Thu, 17 Sep 2015 16:32:37 +0000
parents db3b3354c94b
children b70a423990d3
branches/tags (none)
files vim/custom-dictionary.utf-8.add vim/ftplugin/lisp/lispfolding.vim vim/vimrc

Changes

--- 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
--- 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'
--- 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 <buffer> <cr> :execute "normal! \<lt>cr>"<cr>
 augroup END
 
 " }}}
@@ -2437,7 +2440,12 @@
     diffupdate
 endfunction " }}}
 command! -nargs=0 HgDiff call s:HgDiff()
-nnoremap <leader>Hd :HgDiff<cr>
+
+" Diff the current file
+nnoremap <leader>hd :HgDiff<cr>
+
+" Diff the entire repo
+nnoremap <leader>hD :Clam hg diff<cr>:set ft=diff nowrap<cr>
 
 function! s:HgBlame() " {{{
     let fn = expand('%:p')
@@ -2459,7 +2467,16 @@
     syncbind
 endfunction " }}}
 command! -nargs=0 HgBlame call s:HgBlame()
-nnoremap <leader>Hb :HgBlame<cr>
+nnoremap <leader>hb :HgBlame<cr>
+
+function! s:HgStatus() " {{{
+    Clam hg status
+endfunction " }}}
+command! -nargs=0 HgStatus call s:HgStatus()
+nnoremap <leader>hs :HgStatus<cr>
+
+" Bare hg commands
+nnoremap <leader>h<space> :!hg<space>
 
 " }}}
 " J {{{