From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (qmail 20779 invoked by alias); 9 Feb 2012 15:38:01 -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: X-Seq: 30193 Received: (qmail 7119 invoked from network); 9 Feb 2012 15:37:50 -0000 X-Spam-Checker-Version: SpamAssassin 3.3.2 (2011-06-06) on f.primenet.com.au X-Spam-Level: X-Spam-Status: No, score=-1.9 required=5.0 tests=BAYES_00,RCVD_IN_DNSWL_NONE autolearn=ham version=3.3.2 Received-SPF: none (ns1.primenet.com.au: domain at closedmail.com does not designate permitted sender hosts) From: Bart Schaefer Message-id: <120209073732.ZM31309@torch.brasslantern.com> Date: Thu, 09 Feb 2012 07:37:32 -0800 In-reply-to: Comments: In reply to Mikael Magnusson "\## -> x when completing" (Feb 8, 11:37pm) References: X-Mailer: OpenZMail Classic (0.9.2 24April2005) To: zsh workers Subject: Re: \## -> x when completing MIME-version: 1.0 Content-type: text/plain; charset=us-ascii This gets a bit stream-of-consciousness but maybe that's helpful. On Feb 8, 11:37pm, Mikael Magnusson wrote: } Subject: \## -> x when completing } } zsh -f } touch xenon } autoload compinit; compinit } setopt globcomplete } cat \## -> cat xenon Hmm. This is probably happening because the completion internals use an "x" as a place-holder in some instances. See the functions comptils.c:comp_quote, compcore.c:tildequote, and zle_tricky.c:addx, the latter of which has a big comment explaining what's going on. However, I think it's more likely compcore.c:set_comp_sep that is the culprit. We can find out by changing the 'x' to something else in one of addx or set_comp_sep and then trying the completion again. Which reveals that it's neither of those; rather compcore.c:addmatches is playing funny with us, at line 2302: 2293 if (comppatmatch && *comppatmatch) { 2294 int is = (*comppatmatch == '*'); 2295 char *tmp = (char *) zhalloc(2 + llpl + llsl + gfl); 2296 2297 if (gfl) { 2298 strcpy(tmp, globflag); 2299 strcat(tmp, lpre); 2300 } else 2301 strcpy(tmp, lpre); 2302 tmp[llpl + gfl] = 'x'; 2303 strcpy(tmp + llpl + gfl + is, lsuf); 2304 2305 tokenize(tmp); 2306 remnulargs(tmp); 2307 if (haswilds(tmp)) { 2308 if (is) 2309 tmp[llpl + gfl] = Star; 2310 if ((cp = patcompile(tmp, 0, NULL))) 2311 haspattern = 1; 2312 } 2313 } The problem seems to be that remnulargs() has shortened tmp so that the count (llpl + gfl) is no longer correct. I believe we can fix that by moving remnulargs to after line 2309. Index: Src/Zle/compcore.c =================================================================== --- Src/Zle/compcore.c 20 Dec 2011 17:13:38 -0000 1.29 +++ Src/Zle/compcore.c 9 Feb 2012 15:33:44 -0000 @@ -2303,10 +2303,10 @@ strcpy(tmp + llpl + gfl + is, lsuf); tokenize(tmp); - remnulargs(tmp); if (haswilds(tmp)) { if (is) tmp[llpl + gfl] = Star; + remnulargs(tmp); if ((cp = patcompile(tmp, 0, NULL))) haspattern = 1; }