X-Git-Url: http://git.iain.cx/?a=blobdiff_plain;f=.vim%2Fscript%2Fp4;h=7aa16bad8b8be44b70f168d623cbde9808581bb9;hb=06d0d0563b6cee6b5291563c080daac155b83cb2;hp=f599b3fa66d4262f688dced9505ab5d837d334d8;hpb=3222c5168f5cbc028ea147a071e3fd94460aae6d;p=profile.git

diff --git a/.vim/script/p4 b/.vim/script/p4
index f599b3f..7aa16ba 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()
@@ -13,7 +12,7 @@ fun! P4submit()
       " Delete the spec blurb if it exists.
       /^# A Perforce Change Spec/,/^# *(New changelists only\.)$/d
       " If the blurb was deleted the text will be in the unnamed register.
-      if @" != "grgergregergeg"
+      if @" != ""
         " Delete the blank line left above the remaining fields.
         1
         delete
@@ -21,13 +20,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
-        if l:files != ""
-          exe "r!env P4DIFF= p4 diff -du " .  substitute(l:files, "\n", " ", "g")
-        endif
+        try
+          /everything below this line is just the diff/
+
+          " We are submitting through git p4 so yank the diff.
+          normal j
+          normal yG
+          " Create a new window below the spec and paste the diff.
+          botright new
+          normal p
+        catch
+          " Get the files in the changelist.
+          let l:files = system("sed -n 's@^	\\(//.*\\)	#.*@\"\\1\"@p' " . bufname(""))
+          " Create a new window below the spec and read in a diff.
+          botright new
+          if l:files != ""
+            exe "r!env P4DIFF= p4 diff -du " .  substitute(l:files, "\n", " ", "g")
+          endif
+        endtry
 
         setf diff
 
@@ -38,14 +48,28 @@ fun! P4submit()
         set buftype=nowrite
         set bufhidden=hide
         setlocal noswapfile
-        file [p4 diff]
+        file [p4 diff\]
+        " Map q to quit easily.
+        noremap <silent> <buffer> q <C-W>q
+
+        " Vim 7.4 really doesn't want us to quit windows from a script.
+        try
+          au QuitPre * qa!
+        catch
+        endtry
 
         " Switch back to the top window and put the cursor by the description.
         wincmd k
         resize 10
-        exe "normal G"
-        ?<enter description here>
+        normal G
+        ?^Description:
         let @/ = ""
+        normal j
+        normal ^
+
+        " Set formatting.
+        se noexpandtab
+        se ts=8
       endif
     catch
       " We get here if no blurb was deleted.  This is the case if we aren't