From mboxrd@z Thu Jan 1 00:00:00 1970 X-Spam-Checker-Version: SpamAssassin 3.4.4 (2020-01-24) on inbox.vuxu.org X-Spam-Level: X-Spam-Status: No, score=-3.3 required=5.0 tests=DKIM_SIGNED,DKIM_VALID, MAILING_LIST_MULTI,RCVD_IN_DNSWL_MED,T_SCC_BODY_TEXT_LINE, UNPARSEABLE_RELAY autolearn=ham autolearn_force=no version=3.4.4 Received: (qmail 12999 invoked from network); 3 Jun 2022 02:42:20 -0000 Received: from zero.zsh.org (2a02:898:31:0:48:4558:7a:7368) by inbox.vuxu.org with ESMTPUTF8; 3 Jun 2022 02:42:20 -0000 ARC-Seal: i=1; cv=none; a=rsa-sha256; d=zsh.org; s=rsa-20210803; t=1654224140; b=jj+5NE643WXmgyQSH9koy57pUagJwj38BSY3qEMAwPK65L5rfllXjJC/WyWoFbclQN2RzAI6bO SZcQWtV9Ojq4h2GaT3XRHPpsaIjJNkwcSSXZx1oEwAH0+nJeJ6i/bYLet4XCosqbpfJbsY7xzz xCij+pYxtlOiK9qTbw66+y42Nq1LtFnCYT0pacroc9MZk+HPPi3EyMxcoP/i3LK/M63652hLje um8r8BARn+CeTFFwH/CW3C2xpfux0xHPngOJjyohabz+Q267p+UKZDhGXQi1PHXlfCC4ycC3kf vqgh31+qnrp7gPolCoH+HrcMnuZW8mVmyNcF3EZa9vP9eg==; ARC-Authentication-Results: i=1; zsh.org; iprev=pass (mail-ed1-f42.google.com) smtp.remote-ip=209.85.208.42; dkim=pass header.d=brasslantern-com.20210112.gappssmtp.com header.s=20210112 header.a=rsa-sha256; dmarc=none header.from=brasslantern.com; arc=none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed; d=zsh.org; s=rsa-20210803; t=1654224140; bh=kSm7tPQlqlGfai/vKewxQUCySsR5Rhm5N43+ymiYn7U=; h=List-Archive:List-Owner:List-Post:List-Unsubscribe:List-Subscribe:List-Help: List-Id:Sender:Content-Type:Cc:To:Subject:Message-ID:Date:From:In-Reply-To: References:MIME-Version:DKIM-Signature:DKIM-Signature; b=OGSHuJ0NDsyh5p8xNKRJHWXJU0SKrPWGNnmoaWD1/zIOqdCOY75FAjAFEHAmTIDvzt12MSLZna hckdf0Va4/LL3++wPXLq/T0Qsg88UUxAxDYTxfmSHBje5vCBN0irN8s0YtEY/EoFUGfXGWZdv6 /GrGGKC5WFkpwp2FuzjDIZAVpclNDtS10CHz/rPaDAyLPW6dfnWdxahBGtRo1hqdEEzOQ1FwJ7 PWJ8v20by5f8RW7xTVkfVah1TvmDkWn1Aw4UgDfzdM0V7vNww0n2kPCuC9HLI969IPCfzhBP3B hGUy8oMrLWILosy0FFSYpMnf2hYkHzh0suDgb2+4gqSbdw==; DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=zsh.org; s=rsa-20210803; h=List-Archive:List-Owner:List-Post:List-Unsubscribe: List-Subscribe:List-Help:List-Id:Sender:Content-Type:Cc:To:Subject:Message-ID :Date:From:In-Reply-To:References:MIME-Version:Reply-To: Content-Transfer-Encoding:Content-ID:Content-Description:Resent-Date: Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID; bh=JjIUibTXLWcDl8GKjbSBSBdQ2RhLd2/O6gnD5/AlyVM=; b=M6VzFYtj7VQHZlJkCQfeZmKfj1 9z4a0e28tRYWo4sfHexluB7/8WypcEDwlw9QYW664yQOOcA3ehxPrpiAV/gMajb2Flz3EZKCMITgc 0SlmU4q45R5dwXuP19mPdI9NRDYsQxYGRIrzRnocxEPg2pCb7rn4pGzmi3VPUHMoB6aU9Ab4styxa A6KDtjZVZ1x/0ptPZZlqcMM0Hl/lkXbCSxt5ny951AFJZU+KDtef/MnODVLKBK29sTkCQikosYmmC KlX4Tn74sYTTXkjMtQbqO9hR6IDcjNOzoZuhg39P+u6DGBDjSR8aCU+7W8KvHGsCEmSjSkkSihqEK Q2/bpa/g==; Received: from authenticated user by zero.zsh.org with local id 1nwxGV-000FFc-9a; Fri, 03 Jun 2022 02:42:19 +0000 Authentication-Results: zsh.org; iprev=pass (mail-ed1-f42.google.com) smtp.remote-ip=209.85.208.42; dkim=pass header.d=brasslantern-com.20210112.gappssmtp.com header.s=20210112 header.a=rsa-sha256; dmarc=none header.from=brasslantern.com; arc=none Received: from mail-ed1-f42.google.com ([209.85.208.42]:33612) by zero.zsh.org with esmtps (TLS1.3:TLS_AES_128_GCM_SHA256:128) id 1nwxGC-000EuG-Ii; Fri, 03 Jun 2022 02:42:00 +0000 Received: by mail-ed1-f42.google.com with SMTP id h19so8527242edj.0 for ; Thu, 02 Jun 2022 19:42:00 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=brasslantern-com.20210112.gappssmtp.com; s=20210112; h=mime-version:references:in-reply-to:from:date:message-id:subject:to :cc; bh=JjIUibTXLWcDl8GKjbSBSBdQ2RhLd2/O6gnD5/AlyVM=; b=iT/010Kut1FZqdqEV/rtcdJg1IS6tKqj8t38007jCUn9YIKLAP2xZGxx15sAsCsjr1 at8xGHYUiqK+VwLr0QNhKOvt76kKhfrsIqC/Qt423udb5Z+AmDjCFNDHZxiXZb7lZ6e8 HKOxSOcdGZmbmWD6UPp1+N/eHHDVkih5IYNczDt3s5e9b/sW8JTtRr7tgLdEvaBQlPZp yw1wAQ2YOYXYZiPYcbGx6E1FD0CNBxr03AW9stnF6GurHycksTRrJUqqSWJKhXSoTxEe URLr8Mbf4CKSQTTFefslOs7NQ9jOFdPNQpKZgRR7+ogxUJbvdqiPwSls7ETGHli4Nt7E sEoQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:mime-version:references:in-reply-to:from:date :message-id:subject:to:cc; bh=JjIUibTXLWcDl8GKjbSBSBdQ2RhLd2/O6gnD5/AlyVM=; b=RZXVXh3Is/PD7SfNOovZk8jR8u2CH6JuB3UHRJIH7laEPlxsNdTIxYJ4DJZJhgSxN0 w/TsAZP537oubISu0lsRwVmTuCr8QGI3JRbXZEpFZox7am7qtEQgsIfI64XAe+LqU9/D YeCaeOeWeHsGXWMDyKa9H1yX3LKVmJT4WLBiTDiqv6rlRuFIe4u9Q06ybFjDrVl7Kp7H G+HiMZ+PXaGYhEHPDrY/MoNkpAoE1gDL1jKVa4cDXLyB9gkQDMtw8nF3mqWw3eRp9w7m 8OcGcqTzi5TQxE7+8N+LQpn8QIZ8j1lO38NJm/pv7hs7v6TiaRavUNgIGIAsPcGWDLRF ImLw== X-Gm-Message-State: AOAM531GJ2aMoHnXAqaE5kgeAaDYBKjBlZGDv6oDzw8DFd3/FA7jVQI2 BJuQNycoInSNLInygpVS7yGbZMlB1SzUqzFe26Doog== X-Google-Smtp-Source: ABdhPJy4MYjMwyYxPMW2Xu3nkV4cHYGMYHZJ4Cm7AdoPW53SSP7Ae1oJK1Nad3gz8RtQ2QgvHssea+tOu76yrYZWzmk= X-Received: by 2002:a05:6402:510a:b0:42b:66c3:d4fd with SMTP id m10-20020a056402510a00b0042b66c3d4fdmr8542832edd.260.1654224120169; Thu, 02 Jun 2022 19:42:00 -0700 (PDT) MIME-Version: 1.0 References: In-Reply-To: From: Bart Schaefer Date: Thu, 2 Jun 2022 19:41:48 -0700 Message-ID: Subject: Re: Regression affecting completion with NO_CASE_GLOB To: John Heatherington Cc: Zsh hackers list Content-Type: text/plain; charset="UTF-8" X-Seq: 50325 Archived-At: X-Loop: zsh-workers@zsh.org Errors-To: zsh-workers-owner@zsh.org Precedence: list Precedence: bulk Sender: zsh-workers-request@zsh.org X-no-archive: yes List-Id: List-Help: List-Subscribe: List-Unsubscribe: List-Post: List-Owner: List-Archive: On Thu, Jun 2, 2022 at 7:34 PM Bart Schaefer wrote: > > There are two ways to go here: Revert the pattern_match_equivalence() > change and alter cfp_matcher_range() to add one to the index that it > passes, or change the other two callers to decrement their indices by > one. I tested the latter and it works as expected, but I think the > former might be the more sensible approach. In fact pattern_match1() calls PATMATCHRANGE() and then returns ind+1, whereas cfp_matcher_range() calls PATMATCHRANGE() and then uses ind directly, so it's pretty clear that reverting and fixing cfp_matcher_range() is the right way to go. diff --git a/Src/Zle/compmatch.c b/Src/Zle/compmatch.c index bb8359f1d..56e5509a4 100644 --- a/Src/Zle/compmatch.c +++ b/Src/Zle/compmatch.c @@ -1319,7 +1319,7 @@ pattern_match_equivalence(Cpattern lp, convchar_t wind, int wmtp, convchar_t lchr; int lmtp; - if (!PATMATCHINDEX(lp->u.str, wind, &lchr, &lmtp)) { + if (!PATMATCHINDEX(lp->u.str, wind-1, &lchr, &lmtp)) { /* * No equivalent. No possible match; give up. */ diff --git a/Src/Zle/computil.c b/Src/Zle/computil.c index 59abb4cc4..77ccdebf7 100644 --- a/Src/Zle/computil.c +++ b/Src/Zle/computil.c @@ -4383,7 +4383,7 @@ cfp_matcher_range(Cmatcher *ms, char *add) * word pattern. */ if ((ind = pattern_match_equivalence - (m->word, ind, mt, addc)) != CHR_INVALID) { + (m->word, ind+1, mt, addc)) != CHR_INVALID) { if (ret) { if (imeta(ind)) { *p++ = Meta;