Use canonical diff format.

[profile.git] / .vim / script / p4

diff --git a/.vim/script/p4 b/.vim/script/p4
index 7970330..ecaacaf 100644 (file)
--- 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()
@@ -16,16 +17,17 @@ fun! P4submit()
 
         " Create a new window, move it below the spec and read in a diff.
         botright new
-        r!p4 diff
+        r!env P4DIFF= p4 diff -du
         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 +45,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 +57,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