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

diff --git a/.vim/script/svn b/.vim/script/svn
index 175f4fb..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
@@ -33,9 +41,6 @@ endfun
 let s:cmdheight = &cmdheight
 se cmdheight=3
 
-" Change directory so "file [svn diff]" doesn't try to cd somewhere.
-cd /
-
 " Call and then discard our function.
 call SVNcommit()
 delfunction SVNcommit
@@ -44,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