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

…nstead
zsh-users · Jun 4, 2022 · 3e3cfab · 3e3cfab
1 parent 22b1a91
commit 3e3cfab
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 2 deletions.
diff --git a/ChangeLog b/ChangeLog
@@ -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):

diff --git 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
@@ -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;