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
Updated characterize plugin.
[profile.git]
/
.vim
/
script
/
svn
diff --git
a/.vim/script/svn
b/.vim/script/svn
index
8ee0390
..
f648862
100644
(file)
--- a/
.vim/script/svn
+++ b/
.vim/script/svn
@@
-1,23
+1,33
@@
-" $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.
" 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
+ set nomodified
+
+ " 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
" Create a new window, move it below the spec and read in a diff.
botright new
- r!svn diff
+ exe "r!svn diff " . substitute(l:files, "\n", " ", "g")
setf diff
" Delete the blank line left above the diff.
1
delete
setf diff
" Delete the blank line left above the diff.
1
delete
- se nobuflisted
- set buftype=nowrite
- set bufhidden=hide
+ set ro
+ set nomodifiable
+ set nomodified
+ set nobuflisted
+ set buftype=help
setlocal noswapfile
setlocal noswapfile
- file [svn diff]
+ file [svn diff\]
+ " Map q to quit easily.
+ nnoremap <silent> <buffer> q <C-W>q
" Switch back to the top window.
wincmd k
" Switch back to the top window.
wincmd k
@@
-25,7
+35,7
@@
endfun
" Expand the command line window so we don't have to press RETURN later.
let s:cmdheight = &cmdheight
" Expand the command line window so we don't have to press RETURN later.
let s:cmdheight = &cmdheight
-se cmdheight=
2
+se cmdheight=
3
" Call and then discard our function.
call SVNcommit()
" Call and then discard our function.
call SVNcommit()
@@
-35,4
+45,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