X-Git-Url: http://git.iain.cx/?a=blobdiff_plain;f=.vim%2Fscript%2Fp4;h=9319906d7a7ac4cc9ed21c6a8b7bf731a4cc94b2;hb=d0d885039e0b7f2242d6db6eb2ba36da132f1b94;hp=797033031638968e74d04f23490b2fc8149fecd5;hpb=d6eec91ae814fc64a5ad5859f0559e95cb2124ca;p=profile.git

diff --git a/.vim/script/p4 b/.vim/script/p4
index 7970330..9319906 100644
--- a/.vim/script/p4
+++ b/.vim/script/p4
@@ -1,3 +1,4 @@
+" $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! P4submit()
@@ -14,18 +15,24 @@ fun! P4submit()
         " Allow closing an unmodified spec.
         set nomod
 
+        " Get the files in the changelist.
+        let l:files = system("sed -n 's@^	\\(//.*\\)	#.*@\\1@p' " . bufname(""))
         " Create a new window, move it below the spec and read in a diff.
         botright new
-        r!p4 diff
+        if l:files != ""
+          exe "r!env P4DIFF= p4 diff -du " .  substitute(l:files, "\n", " ", "g")
+        endif
+
         setf diff
 
         " Delete the blank line left above the diff.
         1
         delete
         set nobuflisted
-        set buftype=nofile
+        set buftype=nowrite
         set bufhidden=hide
         setlocal noswapfile
+        file [p4 diff]
 
         " Switch back to the top window and put the cursor by the description.
         wincmd k
@@ -43,7 +50,7 @@ endfun
 
 " Expand the command line window so we don't have to press RETURN later.
 let s:cmdheight = &cmdheight
-set cmdheight=2
+set cmdheight=3
 
 " Call and then discard our function.
 call P4submit()
@@ -55,4 +62,10 @@ set noexpandtab
 exe "set 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