From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on dcvr.yhbt.net X-Spam-Level: X-Spam-ASN: AS3215 2.6.0.0/16 X-Spam-Status: No, score=-3.6 required=3.0 tests=AWL,BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,FREEMAIL_FORGED_FROMDOMAIN,FREEMAIL_FROM, HEADER_FROM_DIFFERENT_DOMAINS,MAILING_LIST_MULTI,SPF_HELO_NONE, SPF_PASS,T_SCC_BODY_TEXT_LINE shortcircuit=no autolearn=ham autolearn_force=no version=3.4.2 Received: from out1.vger.email (out1.vger.email [IPv6:2620:137:e000::1:20]) by dcvr.yhbt.net (Postfix) with ESMTP id E31D21F54E for ; Tue, 9 Aug 2022 01:08:31 +0000 (UTC) Authentication-Results: dcvr.yhbt.net; dkim=pass (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.b="QYwL4Sfg"; dkim-atps=neutral Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S244680AbiHIBIa (ORCPT ); Mon, 8 Aug 2022 21:08:30 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:55112 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S232876AbiHIBI3 (ORCPT ); Mon, 8 Aug 2022 21:08:29 -0400 Received: from mail-ej1-x62d.google.com (mail-ej1-x62d.google.com [IPv6:2a00:1450:4864:20::62d]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 7F5061D332 for ; Mon, 8 Aug 2022 18:08:28 -0700 (PDT) Received: by mail-ej1-x62d.google.com with SMTP id kb8so19690550ejc.4 for ; Mon, 08 Aug 2022 18:08:28 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=cc:to:subject:message-id:date:from:in-reply-to:references :mime-version:from:to:cc; bh=jqbDgqlfD8Qt7u61qNp/OpKjqQMYQ0bLlS2eBVDi084=; b=QYwL4Sfg3qngRg4K2SCk85/fqSmFT4Ctd6yCQV2OV0kP9M+zv4m4pNDlShPoYTFdsw QawwegMi7az6j3hVvecr9l3jRPYSw62i3LmVzfsZdG2z/qts3WaNC75yNP/riYJC6FGx ZKS1L+va2UcHnzVkauEDOJIRkZ3CGpyGMeJZe0okWKVpmugYyKI8YaL7cptJcyUSAm9M 4DiqH2PWu1PlJRONjHIWf5KVehFwNPrAtQjCGS9bSkrKThUflOR9jfAs5KR/prdUfkP2 mPl/ynXxbd0keblkuJ2L8rcp84caG9eAVRtU3x/wtBbeCExIbwOZYs+L+PNGa2j6j/aS GDiw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=cc:to:subject:message-id:date:from:in-reply-to:references :mime-version:x-gm-message-state:from:to:cc; bh=jqbDgqlfD8Qt7u61qNp/OpKjqQMYQ0bLlS2eBVDi084=; b=FZc0MCeH02d34O/eVBvBVSn9LocilrZDqol16ZP+0WGuzSVCyd+nKlUXqlaeCtyySX gpcQWaGsJLuFM+3aosuFJbgsH8FqoXwgG+oEXjktwoSsSFGU7fzY5lcqH6yAORHy75rK YpByzIMYhmKsIE3SxOyV3STozw8cEIxA6VnCJGpSbPmKvIAqcL6ZTV+ll+XWAkbLrmAi TxnPOrrC//KI5IUVzTNH+2XchTW9n/RbjRRwx+v4ig+Zpo9AVOnGBNsg61oMndn8EMaY aqQvMWlxIue8Y9NNlpHevoivWF3MJxa5JEbXhWB9i44/Ab8V48pi3GTDv8LFoEDsND0x dmIg== X-Gm-Message-State: ACgBeo2f6CDY9ZyyCoVpP2y/xgVIA9H4gnqkRFg2JbIA0EsYUhiAFZO+ gL5R2OWg2S6MItoFZUtByNQrEUqQ5eEEnG9FeZoSQpGUbzU= X-Google-Smtp-Source: AA6agR5aTYTfmMKPiW/wOtSE1yBL/rMYcf+PPbi522bO+1dWTa+TsK4XvcIPZc2WKMe7nbezhi3Vg+hzuk7Qova3Xkw= X-Received: by 2002:a17:907:28c8:b0:730:9ccc:331f with SMTP id en8-20020a17090728c800b007309ccc331fmr15091703ejc.608.1660007306835; Mon, 08 Aug 2022 18:08:26 -0700 (PDT) MIME-Version: 1.0 References: <20220809004549.123020-1-felipe.contreras@gmail.com> <20220809004549.123020-8-felipe.contreras@gmail.com> In-Reply-To: <20220809004549.123020-8-felipe.contreras@gmail.com> From: Felipe Contreras Date: Mon, 8 Aug 2022 20:08:16 -0500 Message-ID: Subject: Re: [PATCH v3 7/7] mergetools: vimdiff: restore selective diff mode To: git@vger.kernel.org Cc: Fernando Ramos Content-Type: text/plain; charset="UTF-8" Precedence: bulk List-ID: X-Mailing-List: git@vger.kernel.org On Mon, Aug 8, 2022 at 7:46 PM Felipe Contreras wrote: > > Apparently some people want the diff mode to show differences only on > the visible windows, so turn this on only when the tab has more than one > window. > @@ -323,8 +323,20 @@ gen_cmd () { > IFS=+ > for tab in $LAYOUT > do > - test -n "$CMD" && CMD="$CMD | tabnew | silent execute 'bufdo diffthis'" > - CMD=$(gen_cmd_aux "$tab" "$CMD") > + if echo "$tab" | grep ",\|/" >/dev/null > + then > + test -n "$CMD" && CMD="$CMD | tabnew" > + CMD=$(gen_cmd_aux "$tab" "$CMD") > + CMD="$CMD | execute 'windo diffthis'" > + else > + if test -z "$CMD" > + then > + CMD="silent execute 'bufdo diffthis'" > + else > + CMD="$CMD | tabnew | silent execute 'bufdo diffthis'" > + fi > + CMD=$(gen_cmd_aux "$tab" "$CMD") > + fi > done > IFS=$oldIFS > Notice that after reorganizing the tab handling my layout becomes really simple: set hidden diffopt-=hiddenoff | silent execute 'bufdo diffthis' | 4b And your layout becomes: set hidden diffopt-=hiddenoff | echo | leftabove vertical split | 2b | wincmd l | 1b | execute 'windo diffthis' | tabnew | leftabove vertical split | 2b | wincmd l | 3b | execute 'windo diffthis' So this "works" too, right? Cheers. -- Felipe Contreras