All of lore.kernel.org
 help / color / mirror / Atom feed
From: Felipe Contreras <felipe.contreras@gmail.com>
To: git@vger.kernel.org
Cc: Fernando Ramos <greenfoo@u92.eu>,
	Felipe Contreras <felipe.contreras@gmail.com>
Subject: [PATCH 2/2] mergetools: vimdiff3: fix diffopt options
Date: Tue,  2 Aug 2022 16:41:34 -0500	[thread overview]
Message-ID: <20220802214134.681300-3-felipe.contreras@gmail.com> (raw)
In-Reply-To: <20220802214134.681300-1-felipe.contreras@gmail.com>

If either closeoff or hiddenoff are enabled, vimdiff3 doesn't work as
intended, so turn them off.

Signed-off-by: Felipe Contreras <felipe.contreras@gmail.com>
---
 mergetools/vimdiff | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/mergetools/vimdiff b/mergetools/vimdiff
index f4c3bf6d11..baccabc403 100644
--- a/mergetools/vimdiff
+++ b/mergetools/vimdiff
@@ -395,7 +395,7 @@ merge_cmd () {
 		else
 			CMD='hid | hid'
 		fi
-		FINAL_CMD="-d -c '$CMD'"
+		FINAL_CMD="-d -c 'setl diffopt-=closeoff diffopt-=hiddenoff | $CMD'"
 		;;
 	*)
 		case "$1" in
-- 
2.37.1.313.ge269dbcbc5


  parent reply	other threads:[~2022-08-02 21:41 UTC|newest]

Thread overview: 15+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2022-08-02 21:41 [PATCH 0/2] mergetools: vimdiff3: fix regression Felipe Contreras
2022-08-02 21:41 ` [PATCH 1/2] mergetools: vimdiff3: make it work as intended Felipe Contreras
2022-08-02 21:41 ` Felipe Contreras [this message]
2022-08-06 16:25 ` [PATCH 0/2] mergetools: vimdiff3: fix regression Fernando Ramos
2022-08-06 16:27   ` Fernando Ramos
2022-08-06 17:53   ` Felipe Contreras
2022-08-06 18:29     ` Fernando Ramos
2022-08-06 18:37       ` [PATCH] vimdiff: fix 'vimdiff3' behavior (colors + no extra key press) Fernando Ramos
2022-08-06 19:39         ` Felipe Contreras
2022-08-06 21:26           ` Fernando Ramos
2022-08-06 21:30             ` Fernando Ramos
2022-08-07  0:55               ` Felipe Contreras
2022-08-06 19:17       ` [PATCH 0/2] mergetools: vimdiff3: fix regression Felipe Contreras
2022-08-06 21:23         ` Fernando Ramos
2022-08-07  0:44           ` Felipe Contreras

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20220802214134.681300-3-felipe.contreras@gmail.com \
    --to=felipe.contreras@gmail.com \
    --cc=git@vger.kernel.org \
    --cc=greenfoo@u92.eu \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body. 
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.