38 lines
1.2 KiB
Diff
38 lines
1.2 KiB
Diff
|
From 3e3cfabcc74dc79d4d8717c4e5859d8d01be6c54 Mon Sep 17 00:00:00 2001
|
||
|
|
From: Bart Schaefer <schaefer@zsh.org>
|
||
|
|
Date: Fri, 3 Jun 2022 20:08:15 -0700
|
||
|
|
Subject: [PATCH] 50325: revert 38150 and fix in calling function
|
||
|
|
cfp_matcher_range() instead
|
||
|
|
|
||
|
|
---
|
||
|
|
Src/Zle/compmatch.c | 2 +-
|
||
|
|
Src/Zle/computil.c | 2 +-
|
||
|
|
1 files changed, 2 insertions(+), 2 deletions(-)
|
||
|
|
|
||
|
|
diff --git a/Src/Zle/compmatch.c b/Src/Zle/compmatch.c
|
||
|
|
index bb8359f1d1..56e5509a45 100644
|
||
|
|
--- a/Src/Zle/compmatch.c
|
||
|
|
+++ b/Src/Zle/compmatch.c
|
||
|
|
@@ -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.
|
||
|
|
*/
|
||
|
|
diff --git a/Src/Zle/computil.c b/Src/Zle/computil.c
|
||
|
|
index 59abb4cc40..77ccdebf7e 100644
|
||
|
|
--- a/Src/Zle/computil.c
|
||
|
|
+++ b/Src/Zle/computil.c
|
||
|
|
@@ -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;
|