From 65ce28ba266949c2b6d448202e3b97db1559b12a Mon Sep 17 00:00:00 2001
From: Nikola Forró <nforro@redhat.com>
Date: Dec 21 2016 12:09:34 +0000
Subject: Fix character classes with ranges for UTF-8

- resolves #1406385

---

diff --git a/joe-4.2-fix-character-classes.patch b/joe-4.2-fix-character-classes.patch
new file mode 100644
index 0000000..6c85427
--- /dev/null
+++ b/joe-4.2-fix-character-classes.patch
@@ -0,0 +1,34 @@
+From b41f9e84fb87cebcdca1c07c0c3417e819789cb4 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Nikola=20Forr=C3=B3?= <nforro@redhat.com>
+Date: Wed, 21 Dec 2016 13:05:11 +0100
+Subject: [PATCH] Fix character classes with ranges for UTF-8
+
+---
+ joe/regex.c | 4 ----
+ 1 file changed, 4 deletions(-)
+
+diff --git a/joe/regex.c b/joe/regex.c
+index adf870f..170319a 100644
+--- a/joe/regex.c
++++ b/joe/regex.c
+@@ -366,8 +366,6 @@ static int do_parse_conventional(struct regcomp *g, int prec, int fold)
+ 					++g->ptr;
+ 					--g->l;
+ 					last = escape(g->cmap->type, &g->ptr, &g->l, &cat);
+-					if (last != -256)
+-						last = from_uni(g->cmap, last);
+ 				} else {
+ 					last = first;
+ 				}
+@@ -590,8 +588,6 @@ static int do_parse(struct regcomp *g, int prec, int fold)
+ 					++g->ptr;
+ 					--g->l;
+ 					last = escape(g->cmap->type, &g->ptr, &g->l, &cat);
+-					if (last != -256)
+-						last = from_uni(g->cmap, last);
+ 				} else {
+ 					last = first;
+ 				}
+-- 
+2.7.4
+
diff --git a/joe.spec b/joe.spec
index c4eba99..f57f8c9 100644
--- a/joe.spec
+++ b/joe.spec
@@ -1,7 +1,7 @@
 Summary: An easy to use, modeless text editor
 Name: joe
 Version: 4.2
-Release: 2%{?dist}
+Release: 3%{?dist}
 License: GPLv2+
 Group: Applications/Editors
 URL: http://sourceforge.net/projects/joe-editor/
@@ -16,6 +16,7 @@ Patch4: joe-3.8-indent-ow.patch
 Patch5: joe-3.8-aarch64.patch
 Patch6: joe-3.8-format-security.patch
 Patch7: joe-4.2-enable-spec-syntax.patch
+Patch8: joe-4.2-fix-character-classes.patch
 
 BuildRequires: ncurses-devel libselinux-devel
 
@@ -33,6 +34,7 @@ environment.
 %patch5 -p1 -b .aarch64
 %patch6 -p1 -b .format-security
 %patch7 -p0 -b .syntax
+%patch8 -p1
 iconv -f koi8-r -t utf-8 ./man/ru/joe.1.in >./man/ru/joe.1.in.aux
 touch -r ./man/ru/joe.1.in ./man/ru/joe.1.in.aux
 mv ./man/ru/joe.1.in.aux ./man/ru/joe.1.in
@@ -69,6 +71,10 @@ popd
 %{_datadir}/%{name}
 
 %changelog
+* Wed Dec 21 2016 nforro@redhat.com - 4.2-3
+- Fix character classes with ranges for UTF-8
+  resolves #1406385
+
 * Wed Jul 20 2016 Jon Ciesla <limburgher@gmail.com> - 4.2-2
 - Enable spec file syntax highlighting.