X-Git-Url: http://git.iain.cx/?a=blobdiff_plain;f=.vim%2Fscript%2Fsvn;h=7b4da64533b6c36ed3119db61081dbb6e80d7c5a;hb=06d0d0563b6cee6b5291563c080daac155b83cb2;hp=194b48716b3ecb51c80f6d69b3a55e5a640956b1;hpb=bc811c4ff356d27ed2d16eac2c8c16afd034510e;p=profile.git

diff --git a/.vim/script/svn b/.vim/script/svn
index 194b487..7b4da64 100644
--- a/.vim/script/svn
+++ b/.vim/script/svn
@@ -1,12 +1,15 @@
-" $Id$ vim: se 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.
-  let l:files = system("sed '1,/^$/d;s/^[MR]....//' " . bufname(""))
+  " 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
@@ -20,7 +23,15 @@ fun! SVNcommit()
   set buftype=nowrite
   set bufhidden=hide
   setlocal noswapfile
-  file [svn diff]
+  file [svn diff\]
+  " Map q to quit easily.
+  noremap <silent> <buffer> q <C-W>q
+
+  " Vim 7.4 really doesn't want us to quit windows from a script.
+  try
+    au QuitPre * qa!
+  catch
+  endtry
 
   " Switch back to the top window.
   wincmd k
@@ -38,4 +49,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