bybrooklyn/zsh
1
0
Fork 0
mirror of https://git.code.sf.net/p/zsh/code synced 2026-04-18 06:53:35 -04:00
Code Issues Packages Projects Releases Wiki Activity

50325: revert 38150 and fix in calling function cfp_matcher_range() instead

Browse Source
This commit is contained in:
Bart Schaefer
2022-06-03 20:08:15 -07:00
parent 22b1a91c2a
commit 3e3cfabcc7
3 changed files with 7 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
ChangeLog
View File

@@ -3,6 +3,11 @@
* 50306: Src/jobs.c, Src/signals.c, Test/A05execution.ztst: fix
wait builtin for child that has been stopped and continued.
2022-06-02 Bart Schaefer <schaefer@zsh.org>
* 50325: Src/Zle/compmatch.c, Src/Zle/computil.c: revert 38150 and
fix in calling function cfp_matcher_range() instead
2022-05-30 Bart Schaefer <schaefer@zsh.org>
* Marlon Richert: 50307 (cf. PWS 50205):

2
Src/Zle/compmatch.c
View File

@@ -1319,7 +1319,7 @@ pattern_match_equivalence(Cpattern lp, convchar_t wind, int wmtp,
convchar_t lchr;
int lmtp;
if (!PATMATCHINDEX(lp->u.str, wind, &lchr, &lmtp)) {
if (!PATMATCHINDEX(lp->u.str, wind-1, &lchr, &lmtp)) {
/*
* No equivalent. No possible match; give up.
*/

2
Src/Zle/computil.c
View File

@@ -4383,7 +4383,7 @@ cfp_matcher_range(Cmatcher *ms, char *add)
* word pattern.
*/
if ((ind = pattern_match_equivalence
(m->word, ind, mt, addc)) != CHR_INVALID) {
(m->word, ind+1, mt, addc)) != CHR_INVALID) {
if (ret) {
if (imeta(ind)) {
*p++ = Meta;