From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (qmail 4111 invoked from network); 14 Feb 2000 13:07:48 -0000 Received: from sunsite.auc.dk (130.225.51.30) by ns1.primenet.com.au with SMTP; 14 Feb 2000 13:07:48 -0000 Received: (qmail 2909 invoked by alias); 14 Feb 2000 13:07:36 -0000 Mailing-List: contact zsh-workers-help@sunsite.auc.dk; run by ezmlm Precedence: bulk X-No-Archive: yes X-Seq: 9722 Received: (qmail 2891 invoked from network); 14 Feb 2000 13:07:35 -0000 Date: Mon, 14 Feb 2000 14:07:34 +0100 (MET) Message-Id: <200002141307.OAA10653@beta.informatik.hu-berlin.de> From: Sven Wischnowsky To: zsh-workers@sunsite.auc.dk In-reply-to: Sven Wischnowsky's message of Mon, 14 Feb 2000 14:03:25 +0100 (MET) Subject: Re: help with _match, globcomplete etc. (with PATCH) Err, sorry. Here is the patch. Bye Sven diff -ru ../z.old/Completion/Commands/_expand_word Completion/Commands/_expand_word --- ../z.old/Completion/Commands/_expand_word Mon Feb 14 11:54:38 2000 +++ Completion/Commands/_expand_word Mon Feb 14 13:38:48 2000 @@ -8,7 +8,7 @@ local curcontext="$curcontext" if [[ -z "$curcontext" ]]; then - curcontext="correct-word:::" + curcontext="expand-word:::" else curcontext="expand-word:${curcontext#*:}" fi diff -ru ../z.old/Src/Zle/compcore.c Src/Zle/compcore.c --- ../z.old/Src/Zle/compcore.c Mon Feb 14 11:54:13 2000 +++ Src/Zle/compcore.c Mon Feb 14 13:56:53 2000 @@ -295,10 +295,10 @@ haspattern = 0; complistmax = getiparam("LISTMAX"); zsfree(complastprompt); - complastprompt = ztrdup((dolastprompt = - ((isset(ALWAYSLASTPROMPT) && zmult == 1) || - (unset(ALWAYSLASTPROMPT) && zmult != 1))) ? + complastprompt = ztrdup(((isset(ALWAYSLASTPROMPT) && zmult == 1) || + (unset(ALWAYSLASTPROMPT) && zmult != 1)) ? "yes" : ""); + dolastprompt = 1; zsfree(complist); complist = ztrdup(isset(LISTROWSFIRST) ? (isset(LISTPACKED) ? "packed rows" : "rows") : diff -ru ../z.old/Src/Zle/complist.c Src/Zle/complist.c --- ../z.old/Src/Zle/complist.c Mon Feb 14 11:54:13 2000 +++ Src/Zle/complist.c Mon Feb 14 13:58:42 2000 @@ -780,7 +780,7 @@ if (inselect) clearflag = 0; - if (asklist()) { + if (asklist() || !clearflag) { amatches = oamatches; return (noselect = 1); } -- Sven Wischnowsky wischnow@informatik.hu-berlin.de