X-Git-Url: http://git.iain.cx/?a=blobdiff_plain;f=.vim%2Fscript%2Fp4;h=9319906d7a7ac4cc9ed21c6a8b7bf731a4cc94b2;hb=d0d885039e0b7f2242d6db6eb2ba36da132f1b94;hp=402634db45d40d56243e5e5d4983f2b8bceaf91f;hpb=87fd00a95f29f7c98cef42dacc16910b243d81ff;p=profile.git diff --git a/.vim/script/p4 b/.vim/script/p4 index 402634d..9319906 100644 --- a/.vim/script/p4 +++ b/.vim/script/p4 @@ -15,9 +15,14 @@ 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 - r!p4 diff + if l:files != "" + exe "r!env P4DIFF= p4 diff -du " . substitute(l:files, "\n", " ", "g") + endif + setf diff " Delete the blank line left above the diff. @@ -45,7 +50,7 @@ endfun " Expand the command line window so we don't have to press RETURN later. let s:cmdheight = &cmdheight -set cmdheight=2 +set cmdheight=3 " Call and then discard our function. call P4submit()