[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=c0a95fc

The following commit has been merged in the master branch:
commit c0a95fcb508d448da3521b11ba21bcbaa140c371
Author: Maximiliano Curia <maxy at gnuservers.com.ar>
Date:   Mon Mar 27 14:00:31 2017 +0200

    Add upstream patch: Don-t-include-newlines-in-selection-if-trimming-is-on.patch
---
 ...e-newlines-in-selection-if-trimming-is-on.patch | 33 ++++++++++++++++++++++
 debian/patches/series                              |  1 +
 2 files changed, 34 insertions(+)

diff --git a/debian/patches/Don-t-include-newlines-in-selection-if-trimming-is-on.patch b/debian/patches/Don-t-include-newlines-in-selection-if-trimming-is-on.patch
new file mode 100644
index 0000000..1dd4d96
--- /dev/null
+++ b/debian/patches/Don-t-include-newlines-in-selection-if-trimming-is-on.patch
@@ -0,0 +1,33 @@
+From: "Martin T. H. Sandsmark" <martin.sandsmark at kde.org>
+Date: Sun, 15 Jan 2017 14:14:10 +0100
+Subject: Don't include newlines in selection if trimming is on
+
+BUG: 199381
+REVIEW: 129837
+---
+ src/Screen.cpp | 5 +++--
+ 1 file changed, 3 insertions(+), 2 deletions(-)
+
+diff --git a/src/Screen.cpp b/src/Screen.cpp
+index 5438e83b..0b3124a5 100644
+--- a/src/Screen.cpp
++++ b/src/Screen.cpp
+@@ -1185,7 +1185,8 @@ void Screen::writeToStream(TerminalCharacterDecoder* decoder,
+         // this makes it possible to 'select' a trailing new line character after
+         // the text on a line.
+         if (y == bottom &&
+-                copied < count) {
++                copied < count &&
++                !trimTrailingSpaces) {
+             Character newLineChar('
');
+             decoder->decodeLine(&newLineChar, 1, 0);
+         }
+@@ -1257,7 +1258,7 @@ int Screen::copyLineToStream(int line ,
+             // ignore trailing white space at the end of the line
+             for (int i = length-1; i >= 0; i--)
+             {
+-                if (data[i].character == ' ')
++                if (QChar(data[i].character).isSpace())
+                     length--;
+                 else
+                     break;
diff --git a/debian/patches/series b/debian/patches/series
index 2038fc9..e15db8d 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -6,3 +6,4 @@ 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
+Don-t-include-newlines-in-selection-if-trimming-is-on.patch

-- 
konsole packaging