summary refs log tree commit diff
diff options
context:
space:
mode:
authorPeter Stephenson <p.w.stephenson@ntlworld.com>2015-07-05 18:52:00 +0100
committerPeter Stephenson <p.w.stephenson@ntlworld.com>2015-07-05 18:52:00 +0100
commit26d5d2eeac733bcaf9a4bdcb5e9af72b69474899 (patch)
tree3a3e23a7b34faa087e53f71d946e8c206df78876
parent290354ff4630b705c97f40e2f15820d2b7f70a4c (diff)
downloadzsh-26d5d2eeac733bcaf9a4bdcb5e9af72b69474899.tar.gz
zsh-26d5d2eeac733bcaf9a4bdcb5e9af72b69474899.tar.xz
zsh-26d5d2eeac733bcaf9a4bdcb5e9af72b69474899.zip
35692: cfp_matcher_range used wrong raw character
-rw-r--r--ChangeLog3
-rw-r--r--Src/Zle/computil.c2
2 files changed, 4 insertions, 1 deletions
diff --git a/ChangeLog b/ChangeLog
index a52014b14..0df3589a2 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,8 @@
 2015-07-05  Peter Stephenson  <p.w.stephenson@ntlworld.com>
 
+	* 35692: Src/Zle/computil.c: cfp_matcher_range used wrong raw
+	character if it couldn't be converted to wchar_t.
+
 	* 35688: Src/text.c: Slightly more nearly definitive version of
 	turning wordcode case statements back to text.
 
diff --git a/Src/Zle/computil.c b/Src/Zle/computil.c
index 27938c17f..e5db0867b 100644
--- a/Src/Zle/computil.c
+++ b/Src/Zle/computil.c
@@ -4196,7 +4196,7 @@ cfp_matcher_range(Cmatcher *ms, char *add)
 	    addlen = MB_METACHARLENCONV(add, &addc);
 #ifdef MULTIBYTE_SUPPORT
 	    if (addc == WEOF)
-		addc = (wchar_t)(*p == Meta ? p[1] ^ 32 : *p);
+		addc = (wchar_t)(*add == Meta ? add[1] ^ 32 : *add);
 #endif
 
 	    if (!(m = *mp)) {