X-Git-Url: http://git.iain.cx/?a=blobdiff_plain;f=.vim%2Fscript%2Fsvn;h=f648862f8f54a8b2e1649ed5c1b64f005b06b4b2;hb=909140c72cfb9c66bcb4189b975f2ccb18c11384;hp=c47f2183ad3a80b792f636235473d06ec51617bf;hpb=c8f2bc8400b3ee475e4970e14f5bdadd6595f064;p=profile.git

diff --git a/.vim/script/svn b/.vim/script/svn
index c47f218..f648862 100644
--- a/.vim/script/svn
+++ b/.vim/script/svn
@@ -1,22 +1,33 @@
-" $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
+  set nomodified
+
+  " 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 bufhidden=hide
+  set ro
+  set nomodifiable
+  set nomodified
+  set nobuflisted
+  set buftype=help
   setlocal noswapfile
+  file [svn diff\]
+  " Map q to quit easily.
+  nnoremap <silent> <buffer> q <C-W>q
 
   " Switch back to the top window.
   wincmd k
@@ -24,7 +35,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,4 +45,10 @@ delfunction SVNcommit
 exe "se cmdheight=" . s:cmdheight
 
 " Close the scratch buffer.
-au BufWinLeave <buffer=1> qa!
+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