From: "Bart Schaefer" <schaefer@candle.brasslantern.com>
To: martin.ebourne@arcordia.com, zsh-workers@sunsite.dk
Subject: Re: PATCH: Re: New style completion bug when ctrl-C pressed
Date: Thu, 26 Apr 2001 17:32:36 +0000 [thread overview]
Message-ID: <1010426173236.ZM17775@candle.brasslantern.com> (raw)
In-Reply-To: <1010426161153.ZM13644@candle.brasslantern.com>
On Apr 26, 4:11pm, Bart Schaefer wrote:
}
} Try this.
I'm not doing very well with my posted patches the last couple of days.
} + trap '[[ -n "$redef" ]] && unfunction compadd' EXIT INT
The trap doesn't execute in the local scope, so [[ -n $redef ]] always
fails. Try this instead:
diff -rux CVS zsh-forge/current/Completion/Base/Completer/_approximate zsh-4.0/Completion/Base/Completer/_approximate
--- zsh-forge/current/Completion/Base/Completer/_approximate Mon Apr 2 04:05:44 2001
+++ zsh-4.0/Completion/Base/Completer/_approximate Thu Apr 26 10:31:02 2001
@@ -10,7 +10,7 @@
[[ _matcher_num -gt 1 || "${#:-$PREFIX$SUFFIX}" -le 1 ]] && return 1
-local _comp_correct _correct_expl comax cfgacc redef match
+local _comp_correct _correct_expl comax cfgacc match
local oldcontext="${curcontext}" opm="$compstate[pattern_match]"
if [[ "$1" = -a* ]]; then
@@ -48,7 +48,6 @@
# ignored prefix).
if (( ! $+functions[compadd] )); then
- redef=yes
compadd() {
[[ ${argv[(I)-[a-zA-Z]#U[a-zA-Z]#]} -eq 0 &&
"${#:-$PREFIX$SUFFIX}" -le _comp_correct ]] && return
@@ -61,6 +60,7 @@
# fi
builtin compadd "$_correct_expl[@]" "$@"
}
+ trap 'unfunction compadd' EXIT INT
fi
_comp_correct=1
@@ -92,7 +92,6 @@
[[ "$compstate[list]" != list* ]] &&
compstate[list]="$compstate[list] force"
fi
- [[ -n "$redef" ]] && unfunction compadd
compstate[pattern_match]="$opm"
return 0
@@ -102,7 +101,6 @@
(( _comp_correct++ ))
done
-[[ -n "$redef" ]] && unfunction compadd
compstate[pattern_match]="$opm"
return 1
--
Bart Schaefer Brass Lantern Enterprises
http://www.well.com/user/barts http://www.brasslantern.com
Zsh: http://www.zsh.org | PHPerl Project: http://phperl.sourceforge.net
prev parent reply other threads:[~2001-04-26 17:33 UTC|newest]
Thread overview: 3+ messages / expand[flat|nested] mbox.gz Atom feed top
2001-04-26 15:37 martin.ebourne
2001-04-26 16:11 ` PATCH: " Bart Schaefer
2001-04-26 17:32 ` Bart Schaefer [this message]
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1010426173236.ZM17775@candle.brasslantern.com \
--to=schaefer@candle.brasslantern.com \
--cc=martin.ebourne@arcordia.com \
--cc=zsh-workers@sunsite.dk \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
Code repositories for project(s) associated with this public inbox
https://git.vuxu.org/mirror/zsh/
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).