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

diff --git a/.vim/script/p4 b/.vim/script/p4
index fe7f252..3595ed4 100644
--- a/.vim/script/p4
+++ b/.vim/script/p4
@@ -18,33 +18,54 @@ fun! P4submit()
         delete
 
         " Allow closing an unmodified spec.
-        set nomod
+        set nomodified
 
-        " 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
 
         " Delete the blank line left above the diff.
         1
         delete
+        set ro
+        set nomodified
+        set nomodifiable
         set nobuflisted
-        set buftype=nowrite
-        set bufhidden=hide
+        set buftype=help
         setlocal noswapfile
-        file [p4 diff]
+        file [p4 diff\]
+        " Map q to quit easily.
+        nnoremap <silent> <buffer> q <C-W>q
 
         " 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 
@@ -57,9 +78,6 @@ 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