X-Git-Url: http://git.iain.cx/?a=blobdiff_plain;f=.vim%2Fscript%2Fp4;h=f7cabe5793dbb9d120db4f539faa039ad724a6e2;hb=76b5cebac934122bdf500f5d78cc73813e76d96b;hp=0be6351734aea0d48a5fb2e769fcaf2b19c1588d;hpb=c8f2bc8400b3ee475e4970e14f5bdadd6595f064;p=profile.git

diff --git a/.vim/script/p4 b/.vim/script/p4
index 0be6351..f7cabe5 100644
--- a/.vim/script/p4
+++ b/.vim/script/p4
@@ -1,4 +1,4 @@
-" $Id$
+" $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()
@@ -15,18 +15,22 @@ fun! P4submit()
         " Allow closing an unmodified spec.
         set nomod
 
+        " Get the files in the changelist.
+        let l:files = system("sed -n 's/	#.*//p' " . bufname(""))
+
         " Create a new window, move it below the spec and read in a diff.
         botright new
-        r!p4 diff
+        exe "r!env P4DIFF= p4 diff -du " .  substitute(l:files, "\n", "", "g")
         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
@@ -44,7 +48,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()
@@ -56,4 +60,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