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

diff --git a/.vim/script/svn b/.vim/script/svn
index 0eedff1..7b4da64 100644
--- a/.vim/script/svn
+++ b/.vim/script/svn
@@ -5,7 +5,7 @@ fun! SVNcommit()
   set nomod
 
   " Get the modified files.  Discount new files.
-  let l:files = system("sed -n '1,/^$/d;s/^[MR]....//p' " . bufname(""))
+  let l:files = system("sed -n '1,/^$/d;/^[MR]..../{s//\"/;s/$/\"/p;}' " . bufname(""))
 
   if l:files == ""
     return
@@ -23,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
@@ -41,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