X-Git-Url: http://git.iain.cx/?a=blobdiff_plain;f=.vim%2Fscript%2Fp4;h=9319906d7a7ac4cc9ed21c6a8b7bf731a4cc94b2;hb=a994152e93116a14471a7d47afd2234455329283;hp=f69cfb6a5b86c4f687d8077437ce4c994b1d4bb6;hpb=e04927534891bc179e49d461e1cedd99f201cd1f;p=profile.git diff --git a/.vim/script/p4 b/.vim/script/p4 index f69cfb6..9319906 100644 --- a/.vim/script/p4 +++ b/.vim/script/p4 @@ -16,11 +16,13 @@ fun! P4submit() set nomod " Get the files in the changelist. - let l:files = system("sed -n 's@ \(//.*\) #.*@@p' " . bufname("")) - + 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 - exe "r!env P4DIFF= p4 diff -du " . substitute(l:files, "\n", "", "g") + 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.