X-Git-Url: http://git.iain.cx/?a=blobdiff_plain;f=.vim%2Fscript%2Fsvn;h=152d2c9793d0a4a6b030b818f94a335f1db7c2d0;hb=f0503276edd74aa465df5248ff5888df13646f18;hp=fcca7e4ad9c7dd3c0c9358c8c0964b4a4035b547;hpb=dfa89955cebc320a07b0228f743c000a838bf601;p=profile.git

diff --git a/.vim/script/svn b/.vim/script/svn
index fcca7e4..152d2c9 100644
--- a/.vim/script/svn
+++ b/.vim/script/svn
@@ -1,22 +1,31 @@
-" $Id$ vim: set syntax=vim:
 " 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\]
+  " Map q to quit easily.
+  noremap <silent> <buffer> q <C-W>q
 
   " Switch back to the top window.
   wincmd k
@@ -24,7 +33,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()
@@ -34,10 +43,4 @@ delfunction SVNcommit
 exe "se cmdheight=" . s:cmdheight
 
 " Close the scratch buffer.
-if version >= 700
-  " Vim 7 lets us close the buffer by number.  The changelist is always in #1.
-  au BufWinLeave <buffer=1> qa!
-else
-  " Prior versions can only do it by name.  Fall back to a temporary file.
-  au BufWinLeave /tmp/tmp.*.* qa!
-endif
+au BufWinLeave <buffer=1> qa!