git://git.iain.cx/iain
/
profile.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Vim 7.4 won't let us quit windows from a script.
[profile.git]
/
.vim
/
script
/
svn
diff --git
a/.vim/script/svn
b/.vim/script/svn
index
175f4fb
..
7b4da64
100644
(file)
--- a/
.vim/script/svn
+++ b/
.vim/script/svn
@@
-5,7
+5,7
@@
fun! SVNcommit()
set nomod
" Get the modified files. Discount new files.
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
if l:files == ""
return
@@
-23,7
+23,15
@@
fun! SVNcommit()
set buftype=nowrite
set bufhidden=hide
setlocal noswapfile
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
" Switch back to the top window.
wincmd k
@@
-33,9
+41,6
@@
endfun
let s:cmdheight = &cmdheight
se cmdheight=3
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
" 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.
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