diff options
| author | Sven Wischnowsky <wischnow@users.sourceforge.net> | 2001-04-03 11:25:11 +0000 |
|---|---|---|
| committer | Sven Wischnowsky <wischnow@users.sourceforge.net> | 2001-04-03 11:25:11 +0000 |
| commit | 6150ef8696a3081772122743eb650d8449d4f7a3 (patch) | |
| tree | 5218fd9557cf249c2647ffa6d7f5da27bf840cdc | |
| parent | cceb2667651f3f4500be1b44aff2bf95e0beed7b (diff) | |
| download | zsh-6150ef8696a3081772122743eb650d8449d4f7a3.tar.gz zsh-6150ef8696a3081772122743eb650d8449d4f7a3.tar.xz zsh-6150ef8696a3081772122743eb650d8449d4f7a3.zip | |
(13892) fixes for fpaths and completion matching
| -rw-r--r-- | ChangeLog | 6 | ||||
| -rw-r--r-- | Src/Zle/compmatch.c | 3 | ||||
| -rw-r--r-- | Test/comptest | 4 | ||||
| -rwxr-xr-x | Test/ztst.zsh | 1 |
4 files changed, 11 insertions, 3 deletions
diff --git a/ChangeLog b/ChangeLog index 7a15ff772..c631b8688 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,9 @@ +2001-04-03 Sven Wischnowsky <wischnow@zsh.org> + + * 13892: Src/Zle/compmatch.c, Test/comptest, Test/ztst.zsh: + two more places where fpaths to completion functions were used; + follow-up on 13868, fix the fix + 2001-04-02 Clint Adams <schizo@debian.org> * 13889: Completion/Linux/_apm, Completion/Linux/.distfiles, diff --git a/Src/Zle/compmatch.c b/Src/Zle/compmatch.c index fc1e6fb54..8e8a7ae7f 100644 --- a/Src/Zle/compmatch.c +++ b/Src/Zle/compmatch.c @@ -2076,8 +2076,7 @@ join_clines(Cline o, Cline n) if ((diff = sub_join(o, n, tn, 0))) { o->flags = (o->flags & ~CLF_MISS) | of; - if (po && po->prefix && - cmp_anchors(o, po, 0)) { + if (po && po->prefix) { po->flags |= CLF_MISS; po->max += diff; } diff --git a/Test/comptest b/Test/comptest index 85fa5578d..99867c5e3 100644 --- a/Test/comptest +++ b/Test/comptest @@ -1,7 +1,9 @@ comptestinit () { setopt extendedglob [[ -d $ZTST_testdir/Modules/zsh ]] && module_path=( $ZTST_testdir/Modules ) - fpath=( $ZTST_srcdir/../(Completion|Functions)/*~*/CVS(/) ) + fpath=( $ZTST_srcdir/../Functions/*~*/CVS(/) + $ZTST_srcdir/../Completion + $ZTST_srcdir/../Completion/*/*~*/CVS(/) ) zmodload -i zsh/zpty diff --git a/Test/ztst.zsh b/Test/ztst.zsh index 3e8bdef18..b7221b391 100755 --- a/Test/ztst.zsh +++ b/Test/ztst.zsh @@ -64,6 +64,7 @@ fi # Set the function autoload paths to correspond to this build of zsh. fpath=( $ZTST_srcdir/../Functions/*~*/CVS(/) + $ZTST_srcdir/../Completion $ZTST_srcdir/../Completion/*/*~*/CVS(/) ) : ${TMPPREFIX:=/tmp/zsh} |