From 938c4c1e4a3c3e6b5a43baf1147892e6580b0114 Mon Sep 17 00:00:00 2001
From: Peter Stephenson <pws@zsh.org>
Date: Fri, 4 Sep 2015 13:40:28 +0100
Subject: 36421: fix breakage in pattern change in 36415

---
 ChangeLog     | 5 +++++
 Src/pattern.c | 2 +-
 2 files changed, 6 insertions(+), 1 deletion(-)

diff --git a/ChangeLog b/ChangeLog
index fdd7d1179..1c19f1704 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2015-09-04  Peter Stephenson  <p.stephenson@samsung.com>
+
+	* 36421: Src/pattern.c: can't-get-the-staff fix for idiocy in
+	36415.
+
 2015-09-04  Jun-ichi Takimoto <takimoto-j@kba.biglobe.ne.jp>
 
 	* 36417: Doc/Zsh/manual.yo: fix/update top level texinfo menu
diff --git a/Src/pattern.c b/Src/pattern.c
index 7457cbd23..b4ba33e49 100644
--- a/Src/pattern.c
+++ b/Src/pattern.c
@@ -1929,7 +1929,7 @@ charrefinc(char **x, char *y, int *z)
     size_t ret;
 
     if (!(patglobflags & GF_MULTIBYTE) || !(STOUC(**x) & 0x80))
-	return WCHAR_INVALID(*(*x)++);
+	return (wchar_t) STOUC(*(*x)++);
 
     ret = mbrtowc(&wc, *x, y-*x, &shiftstate);
 
-- 
cgit 1.4.1