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

diff --git a/.vim/script/p4 b/.vim/script/p4
index 34e8af4..3dd4217 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,14 +10,18 @@ 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
 
         " Get the files in the changelist.
-        let l:files = system("sed -n 's@^	\\(//.*\\)	#.*@\\1@p' " . bufname(""))
+        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
         if l:files != ""
@@ -34,7 +37,7 @@ fun! P4submit()
         set buftype=nowrite
         set bufhidden=hide
         setlocal noswapfile
-        file [p4 diff]
+        file [p4 diff\]
 
         " Switch back to the top window and put the cursor by the description.
         wincmd k