mirrors/zsh
1
0
Fork 0
mirror of git://git.code.sf.net/p/zsh/code synced 2025-09-29 19:00:57 +02:00
Code Releases Activity

36586: fix completion match right anchor

Browse source
This commit is contained in:
Han Pingtian 2015-09-22 05:55:23 +08:00 committed by Peter Stephenson
parent d2910fd64f
commit acf5bd766a
3 changed files with 12 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
ChangeLog
View file

@ -1,6 +1,12 @@
2015-09-22 Peter Stephenson <p.stephenson@samsung.com> 2015-09-22 Peter Stephenson <p.stephenson@samsung.com>
* 36538: Han Pingtian: Doc/Zsh/compwid.yo: tweak code for match * 36586: Han Pingtian: Src/Zle/compmatch.c: tweak to completion
matching with right anchor.
* 36545: Han Pingtian: Doc/Zsh/compwid.yo: tweak doc for match
anchors e and E.
* 36538: Han Pingtian: Doc/Zsh/compwid.yo: tweak doc for match
anchors to get correct difference between b and B. anchors to get correct difference between b and B.
2015-09-22 Jun-ichi Takimoto <takimoto-j@kba.biglobe.ne.jp> 2015-09-22 Jun-ichi Takimoto <takimoto-j@kba.biglobe.ne.jp>

2
Doc/Zsh/compwid.yo
View file

@ -911,7 +911,7 @@ item(tt(E:)var(lpat)tt(=)var(tpat))(
As tt(l), tt(L), tt(b) and tt(B), with the difference that the command As tt(l), tt(L), tt(b) and tt(B), with the difference that the command
line and trial completion patterns are anchored on the right side. line and trial completion patterns are anchored on the right side.
Here an empty var(ranchor) and the tt(e) and tt(E) forms force the Here an empty var(ranchor) and the tt(e) and tt(E) forms force the
match to the end of the trial completion or command line string. match to the end of the command line or trial completion string.
) )
enditem() enditem()

6
Src/Zle/compmatch.c
View file

@ -820,10 +820,12 @@ match_str(char *l, char *w, Brinfo *bpp, int bc, int *rwlp,
continue; continue;
else if (mp->right) else if (mp->right)
t = pattern_match(mp->right, t = pattern_match(mp->right,
tl + mp->llen - mp->ralen, //tl + mp->llen - mp->ralen,
tl + mp->llen,
NULL, NULL) && NULL, NULL) &&
pattern_match(mp->right, pattern_match(mp->right,
tw + mp->wlen - mp->ralen, //tw + mp->wlen - mp->ralen,
tw + mp->wlen,
NULL, NULL) && NULL, NULL) &&
(!mp->lalen || (!mp->lalen ||
pattern_match(mp->left, tw + mp->wlen - pattern_match(mp->left, tw + mp->wlen -