On Mon, Aug 8, 2022 at 12:35 AM Fernando Ramos <greenfoo@xxxxxx> wrote:
>
> vimdiff3 was introduced in 7c147b77d3 (mergetools: add vimdiff3 mode,
> 2014-04-20) and then partially broken in 0041797449 (vimdiff: new
> implementation with layout support, 2022-03-30) in two ways:
>
> - It does not show colors unless the user has "set hidden" in his
> .vimrc file
>
> - It prompts the user to "Press ENTER" every time it runs.
For the record, in my version these two issues are fixed in a much simpler way:
--- a/mergetools/vimdiff
+++ b/mergetools/vimdiff
@@ -325,7 +325,7 @@ gen_cmd () {
if ! echo "$LAYOUT" | grep ",\|/" >/dev/null
then
buf=$(get_buf "$LAYOUT")
- FINAL_CMD="-c \"echo | ${buf}b | bufdo diffthis\" -c
\"tabfirst\""
+ FINAL_CMD="-c \"echo | set hidden | ${buf}b | silent
bufdo diffthis\" -c \"tabfirst\""
return
fi
> # Add an extra "-c" option to move to the first tab (notice that we
> # can't simply append the command to the previous "-c" string as
> # explained here: https://github.com/vim/vim/issues/9076
>
> - FINAL_CMD="-c \"$CMD\" -c \"tabfirst\""
> + FINAL_CMD="-c \"set hidden diffopt-=hiddenoff diffopt-=closeoff\" -c \"$CMD\" -c \"tabfirst\""
> }
These diffopt settings look awfully familiar.
https://lore.kernel.org/git/20220807024941.222018-7-felipe.contreras@xxxxxxxxx/
--
Felipe Contreras
