X-Git-Url: http://git.iain.cx/?p=profile.git;a=blobdiff_plain;f=.vim%2Fscript%2Fsvn;h=223d0f081607718b49c5f8e8a226b50a7585212c;hp=d5244fb1d185b5453bc7519c8f4b8d1e999ca498;hb=0897bbd45d9649a23a819291f7ab769c563648d1;hpb=eee115c5a05f6e4441f820a67865af17a717ae13

diff --git a/.vim/script/svn b/.vim/script/svn
index d5244fb..223d0f0 100644
--- a/.vim/script/svn
+++ b/.vim/script/svn
@@ -24,6 +24,14 @@ fun! SVNcommit()
   set bufhidden=hide
   setlocal noswapfile
   file [svn diff\]
+  " Map q to quit easily.
+  nnoremap <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