X-Git-Url: http://git.iain.cx/?p=profile.git;a=blobdiff_plain;f=.vim%2Fscript%2Fp4;h=4badc84029925984011311b87ccf4034218cd2cf;hp=8b6ee166cd75e988106e20607085d6b9aa43b278;hb=0897bbd45d9649a23a819291f7ab769c563648d1;hpb=eeed88dfb5042114753bc97292434c4e094c35d1

diff --git a/.vim/script/p4 b/.vim/script/p4
index 8b6ee16..4badc84 100644
--- a/.vim/script/p4
+++ b/.vim/script/p4
@@ -20,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,13 +49,27 @@ fun! P4submit()
         set bufhidden=hide
         setlocal noswapfile
         file [p4 diff\]
+        " Map q to quit easily.
+        nnoremap <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