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

diff --git a/.vim/script/p4 b/.vim/script/p4
index 286130b..7aa16ba 100644
--- a/.vim/script/p4
+++ b/.vim/script/p4
@@ -49,6 +49,14 @@ fun! P4submit()
         set bufhidden=hide
         setlocal noswapfile
         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
@@ -56,6 +64,8 @@ fun! P4submit()
         normal G
         ?^Description:
         let @/ = ""
+        normal j
+        normal ^
 
         " Set formatting.
         se noexpandtab