Cherry-pick upstream commit 3e3cfabc to fix a completion regression

This fixes completion regression with NO_CASE_GLOB in Zsh 5.9.

Closes: #1013434

Thanks: Vincent Lefèvre!

Gbp-Dch: Full

1 files changed, 32 insertions, 0 deletions

diff --git a/debian/patches/cherry-pick-3e3cfabc-revert-38150-and-fix-in-calling-function-cfp_matcher_range-instead.patch b/debian/patches/cherry-pick-3e3cfabc-revert-38150-and-fix-in-calling-function-cfp_matcher_range-instead.patch
new file mode 100644
index 000000000..8424bf4ce
--- /dev/null
+++ b/debian/patches/cherry-pick-3e3cfabc-revert-38150-and-fix-in-calling-function-cfp_matcher_range-instead.patch
@@ -0,0 +1,32 @@
+Origin: commit 3e3cfabcc74dc79d4d8717c4e5859d8d01be6c54
+Description: Fix a completion regression with NO_CASE_GLOB
+Author: Bart Schaefer <schaefer@zsh.org>
+Bug: https://zsh.org/workers/50325
+Bug-Debian: https://bugs.debian.org/1013434
+
+diff --git a/Src/Zle/compmatch.c b/Src/Zle/compmatch.c
+index bb8359f1d..56e5509a4 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 59abb4cc4..77ccdebf7 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;