From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on inbox.vuxu.org X-Spam-Level: X-Spam-Status: No, score=-1.0 required=5.0 tests=MAILING_LIST_MULTI, RCVD_IN_DNSWL_NONE autolearn=ham autolearn_force=no version=3.4.2 Received: from primenet.com.au (ns1.primenet.com.au [203.24.36.2]) by inbox.vuxu.org (OpenSMTPD) with ESMTP id 2a9ae542 for ; Mon, 9 Dec 2019 10:22:35 +0000 (UTC) Received: (qmail 10132 invoked by alias); 9 Dec 2019 10:22:29 -0000 Mailing-List: contact zsh-workers-help@zsh.org; run by ezmlm Precedence: bulk X-No-Archive: yes List-Id: Zsh Workers List List-Post: List-Help: List-Unsubscribe: X-Seq: 44996 Received: (qmail 6565 invoked by uid 1010); 9 Dec 2019 10:22:29 -0000 X-Qmail-Scanner-Diagnostics: from mailout1.w1.samsung.com by f.primenet.com.au (envelope-from , uid 7791) with qmail-scanner-2.11 (clamdscan: 0.102.1/25656. spamassassin: 3.4.2. Clear:RC:0(210.118.77.11):SA:0(-7.0/5.0):. Processed in 3.906059 secs); 09 Dec 2019 10:22:29 -0000 X-Envelope-From: p.stephenson@samsung.com X-Qmail-Scanner-Mime-Attachments: | X-Qmail-Scanner-Zip-Files: | Received-SPF: pass (ns1.primenet.com.au: SPF record at _spf.samsung.com designates 210.118.77.11 as permitted sender) DKIM-Filter: OpenDKIM Filter v2.11.0 mailout1.w1.samsung.com 20191209102145euoutp0143dc30ae0425129115b94911fd451aef~erMpumCBA0928309283euoutp015 X-AuditID: cbfec7f5-a0fff7000001ed1a-1c-5dee2038c471 Message-ID: <1575886903.4486.4.camel@samsung.com> Subject: Re: When GLOB_COMPLETE is on, tab completion does not work with path containing hyphens From: Peter Stephenson To: Date: Mon, 9 Dec 2019 10:21:43 +0000 In-Reply-To: <58e0a555-b3dc-4229-9d7d-371e96b915cb@www.fastmail.com> X-Mailer: Evolution 3.18.5.2-0ubuntu3.2 MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Brightmail-Tracker: H4sIAAAAAAAAA+NgFvrAIsWRmVeSWpSXmKPExsWy7djP87oWCu9iDd6/NLA42PyQyYHRY9XB D0wBjFFcNimpOZllqUX6dglcGe29l9gKTgtUfDx6iamBcStvFyMnh4SAicTU/YuZuhi5OIQE VjBKzNi2gg3C6WOSmDfrIiOE08skcfzHQzaYlicb+pghEssZJb6u3sQOV7V83j1WCOc0o8SW ow+hhp1nlGhcewmsn1fAUOLH8h1gtrBAksTE2RBz2YDiUzfNZgSxRQQkJa41nwazWQRUJK7f vcoEYnMKuEgsuTOVGeIODYkNN48xQcwUlDg58wkLiM0sIC/RvHU22H0SAvfZJP4t6IZqcJE4 1XaMHcIWlnh1fAuULSNxenIPC0RDO6PEmkmv2SGcHkaJTUfvMEJUWUv03QaFBwfQCk2J9bv0 IcKOEst/nWEGCUsI8EnceCsIcQSfxKRt06HCvBIdbUIQ1WoSO5q2MkKEZSSerlGYwKg0C8kH s5B8MAth1QJG5lWM4qmlxbnpqcXGeanlesWJucWleel6yfm5mxiB6eD0v+NfdzDu+5N0iFGA g1GJh1fB6m2sEGtiWXFl7iFGCQ5mJRHeJRNfxQrxpiRWVqUW5ccXleakFh9ilOZgURLnNV70 MlZIID2xJDU7NbUgtQgmy8TBKdXA6F5x7csCXvcmRbeU5Z9LOaYKWpZZSsz9cTp345eeY12/ mi/Xq8p8ZlAUjdiVPpX/SP7BXQ83XGiqrj798dRCbd2k1Z6K4vLPT8xeIHjH8oqA2Me38a/v F0wN02+pVHrblR/1x/Lx/ICa82cVNbdXTK0t7MiZW37yqbOzkIvX9lMvM512x5hnKbEUZyQa ajEXFScCALDdZN4DAwAA X-Brightmail-Tracker: H4sIAAAAAAAAA+NgFmpikeLIzCtJLcpLzFFi42I5/e/4PV0LhXexBk0dshYHmx8yOTB6rDr4 gSmAMUrPpii/tCRVISO/uMRWKdrQwkjP0NJCz8jEUs/Q2DzWyshUSd/OJiU1J7MstUjfLkEv o733ElvBaYGKj0cvMTUwbuXtYuTkkBAwkXiyoY+5i5GLQ0hgKaPEni+H2SESMhKfrnyEsoUl /lzrYoMo6maSeDnzBVhCSOA0o0TvEl+IxHlGiR1Pn4AleAUMJX4s38EGYgsLJElMnP0QzGYD ik/dNJsRxBYRkJS41nwazGYRUJG4fvcqE4jNKeAiseTOVKiTZjBJPLr8CayZWUBTonX7b6iT NCQ23DzGBLFMUOLkzCcsEDXyEs1bZzNPYBSahaRlFpKyWUjKFjAyr2IUSS0tzk3PLTbSK07M LS7NS9dLzs/dxAgM/23Hfm7Zwdj1LvgQowAHoxIPr4LV21gh1sSy4srcQ4wSHMxKIrxLJr6K FeJNSaysSi3Kjy8qzUktPsRoCvTRRGYp0eR8YGzmlcQbmhqaW1gamhubG5tZKInzdggcjBES SE8sSc1OTS1ILYLpY+LglGpg3Nz8w0O5Q1AofP6N1vqrbCpKMp/4zu/f83PHDsst7c8EUyb8 UQgw8uHbvJinof9K0Nf9WxpkL8vvlzmtuuH9HBPNsINJAtMSVt6JWXlb4LVAR651mVyq15XQ 4LyMk4qC/sI2xwU/L/plE+KqIM0iwae5ZWo9r+ns5Ldtv7IVpGe4f22evqFZiaU4I9FQi7mo OBEA/ScwlpUCAAA= X-CMS-MailID: 20191209102144eucas1p2f78120c7a786746ee33362475e91130b X-Msg-Generator: CA Content-Type: text/plain; charset="utf-8" X-RootMTR: 20191209093017epcas1p2480d5b0b15d019330b8aa52f2bb5098a X-EPHeader: CA CMS-TYPE: 201P X-CMS-RootMailID: 20191209093017epcas1p2480d5b0b15d019330b8aa52f2bb5098a References: <000201d5ae2e$caa27230$5fe75690$@3spocketnet.com.tw> <58e0a555-b3dc-4229-9d7d-371e96b915cb@www.fastmail.com> On Mon, 2019-12-09 at 09:29 +0000, Daniel Shahaf wrote: > Mikael Magnusson wrote on Mon, 09 Dec 2019 09:23 +00:00: > >  > > On 12/9/19, Felix.Chen wrote: > > >  > > > % mkdir a-b > > >  > > > % touch a-b/{c,d} > > >  > > >  > > >  > > > Type 'ls a-b' without quotes and press tab multiple times, zsh will cycle > > > through 'ls a-b/c' and 'ls a-b/d'. > > >  > > > But if GLOB_COMPLETE is on, zsh only complete up to 'a-b/'. > > Hi, > >  > > It works fine here, are you using an old version of zsh? (current > > version is 5.7.1) > I can reproduce it in 'zsh -f' + 'setopt GLOB_COMPLETE' but can't > reproduce it if I then run compinit, in current(ish) master. Presuming this is this issue... There may be more like this, comptcl-age completion doesn't get much attention. pws diff --git a/Src/Zle/compctl.c b/Src/Zle/compctl.c index f242e1b28..f86a7552c 100644 --- a/Src/Zle/compctl.c +++ b/Src/Zle/compctl.c @@ -3035,9 +3035,9 @@ sep_comp_string(char *ss, char *s, int noffs)  static void  makecomplistflags(Compctl cc, char *s, int incmd, int compadd)  { -    int t, sf1, sf2, ooffs, um = usemenu, delit, oaw, gflags; +    int t, sf1, sf2, ooffs, um = usemenu, delit, oaw, gflags, ccount;      int mn = mnum, ohp = haspattern; -    char *p, *sd = NULL, *tt, *s1, *s2, *os =  dupstring(s); +    char *p, *sd = NULL, *tt, *s1, *s2, *os =  dupstring(s), *psrc, *pdst;      struct cmlist ms;        ccont |= (cc->mask2 & (CC_CCCONT | CC_DEFCONT | CC_PATCONT)); @@ -3178,7 +3178,15 @@ makecomplistflags(Compctl cc, char *s, int incmd, int compadd)      /* Compute line prefix/suffix. */      lpl = offs;      lpre = zhalloc(lpl + 1); -    memcpy(lpre, s, lpl); +    for (ccount = 0, psrc = s, pdst = lpre; +  ccount < lpl; +  ++ccount, ++psrc, ++pdst) +    { + if (*psrc == Dash) +     *pdst = '-'; + else +     *pdst = *psrc; +    }      lpre[lpl] = '\0';      qlpre = quotename(lpre);      lsuf = dupstring(s + offs);