X-Git-Url: http://git.iain.cx/?a=blobdiff_plain;f=.vim%2Fscript%2Fp4;h=fe7f252648c4ef627485f004e04833344ea7181b;hb=76559e10296433ab488b9d9940c50a39282ee49a;hp=34e8af4a67499e420f491bd9a127dcfd66ddcf08;hpb=3630d98d44d50a5b6a5fa131aac9a3eb49e94d4d;p=profile.git

diff --git a/.vim/script/p4 b/.vim/script/p4
index 34e8af4..fe7f252 100644
--- a/.vim/script/p4
+++ b/.vim/script/p4
@@ -1,4 +1,3 @@
-" $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()
@@ -11,9 +10,13 @@ fun! P4submit()
     let @" = ""
     try
       " Delete the spec blurb if it exists.
-      /^# A Perforce Change Spec/,/^$/d
+      /^# A Perforce Change Spec/,/^# *(New changelists only\.)$/d
       " If the blurb was deleted the text will be in the unnamed register.
       if @" != ""
+        " Delete the blank line left above the remaining fields.
+        1
+        delete
+
         " Allow closing an unmodified spec.
         set nomod
 
@@ -54,6 +57,9 @@ endfun
 let s:cmdheight = &cmdheight
 set cmdheight=3
 
+" Change directory so "file [p4 diff]" doesn't try to cd somewhere.
+cd /
+
 " Call and then discard our function.
 call P4submit()
 delfunction P4submit