[SCM] konsole packaging branch, master, updated. debian/16.12.0-1-15-gc4bb01c

[Maximiliano Curia]

Gitweb-URL: http://git.debian.org/?p=pkg-kde/applications/konsole.git;a=commitdiff;h=5333d05

The following commit has been merged in the master branch:
commit 5333d05740d9fcceb0e33575d733b99d723202b2
Author: Maximiliano Curia <maxy at gnuservers.com.ar>
Date:   Mon Mar 27 13:59:49 2017 +0200

    Add upstream patch: Fix-word-boundaries-with-combining-characters.patch
---
 ...word-boundaries-with-combining-characters.patch | 32 ++++++++++++++++++++++
 debian/patches/series                              |  1 +
 2 files changed, 33 insertions(+)

diff --git a/debian/patches/Fix-word-boundaries-with-combining-characters.patch b/debian/patches/Fix-word-boundaries-with-combining-characters.patch
new file mode 100644
index 0000000..4440471
--- /dev/null
+++ b/debian/patches/Fix-word-boundaries-with-combining-characters.patch
@@ -0,0 +1,32 @@
+From: "Martin T. H. Sandsmark" <martin.sandsmark at kde.org>
+Date: Sun, 15 Jan 2017 16:38:55 +0100
+Subject: Fix word boundaries with combining characters
+
+Without this it doesn't correctly detect word boundaries e. g. in
+arabic.
+
+REVIEW: 129840
+---
+ src/TerminalDisplay.cpp | 9 +++++----
+ 1 file changed, 5 insertions(+), 4 deletions(-)
+
+diff --git a/src/TerminalDisplay.cpp b/src/TerminalDisplay.cpp
+index f8263499..74be5858 100644
+--- a/src/TerminalDisplay.cpp
++++ b/src/TerminalDisplay.cpp
+@@ -2794,10 +2794,11 @@ QChar TerminalDisplay::charClass(const Character& ch) const
+             const QString s = QString::fromUtf16(chars, extendedCharLength);
+             if (_wordCharacters.contains(s, Qt::CaseInsensitive))
+                 return 'a';
+-            bool allLetterOrNumber = true;
+-            for (int i = 0; allLetterOrNumber && i < s.size(); ++i)
+-                allLetterOrNumber = s.at(i).isLetterOrNumber();
+-            return allLetterOrNumber ? 'a' : s.at(0);
++            bool letterOrNumber = false;
++            for (int i = 0; !letterOrNumber && i < s.size(); ++i) {
++                letterOrNumber = s.at(i).isLetterOrNumber();
++            }
++            return letterOrNumber ? 'a' : s.at(0);
+         }
+         return 0;
+     } else {
diff --git a/debian/patches/series b/debian/patches/series
index 9385ee1..2038fc9 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -5,3 +5,4 @@ Fix-build.patch
 TerminalDisplay-Abort-painting-invalid-rect.patch
 Screen-Fix-potential-crash-when-ExtendedCharTable-tries-t.patch
 Handle-surrogate-utf16-characters.patch
+Fix-word-boundaries-with-combining-characters.patch

-- 
konsole packaging