X-Git-Url: http://git.iain.cx/?a=blobdiff_plain;f=.vim%2Fscript%2Fsvn;h=d5244fb1d185b5453bc7519c8f4b8d1e999ca498;hb=eee115c5a05f6e4441f820a67865af17a717ae13;hp=c47f2183ad3a80b792f636235473d06ec51617bf;hpb=c8f2bc8400b3ee475e4970e14f5bdadd6595f064;p=profile.git diff --git a/.vim/script/svn b/.vim/script/svn index c47f218..d5244fb 100644 --- a/.vim/script/svn +++ b/.vim/script/svn @@ -1,22 +1,29 @@ -" $Id$ " Define the function we'll use. It's easier to do this than to faff about " trying to run a sequence of normal mode commands. fun! SVNcommit() " Allow closing an unmodified spec. set nomod + " Get the modified files. Discount new files. + let l:files = system("sed -n '1,/^$/d;/^[MR]..../{s//\"/;s/$/\"/p;}' " . bufname("")) + + if l:files == "" + return + endif + " Create a new window, move it below the spec and read in a diff. botright new - r!svn diff + exe "r!svn diff " . substitute(l:files, "\n", " ", "g") setf diff " Delete the blank line left above the diff. 1 delete se nobuflisted - set buftype=nofile + set buftype=nowrite set bufhidden=hide setlocal noswapfile + file [svn diff\] " Switch back to the top window. wincmd k @@ -24,7 +31,7 @@ endfun " Expand the command line window so we don't have to press RETURN later. let s:cmdheight = &cmdheight -se cmdheight=2 +se cmdheight=3 " Call and then discard our function. call SVNcommit()