[meld/Python3: 14/54] meldbuffer: Fix bad forward-port
- From: Kai Willadsen <kaiw src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [meld/Python3: 14/54] meldbuffer: Fix bad forward-port
- Date: Sun, 1 May 2016 22:23:11 +0000 (UTC)
commit a373522f053a4e4a047f84fbbaa8b4d8a858f896
Author: Kai Willadsen <kai willadsen gmail com>
Date: Sat Nov 14 06:53:40 2015 +1000
meldbuffer: Fix bad forward-port
meld/meldbuffer.py | 3 +--
1 files changed, 1 insertions(+), 2 deletions(-)
---
diff --git a/meld/meldbuffer.py b/meld/meldbuffer.py
index ca3e96b..3bfd24d 100644
--- a/meld/meldbuffer.py
+++ b/meld/meldbuffer.py
@@ -287,8 +287,7 @@ class BufferLines(object):
if not line_end.ends_line():
line_end.forward_to_line_end()
txt = self.buf.get_text(line_start, line_end, False)
- txt_filtered = self.textfilter(txt, self.buf, line_start, line_end)
- return text_type(txt_filtered, 'utf8')
+ return self.textfilter(txt, self.buf, line_start, line_end)
def __len__(self):
return self.buf.get_line_count()
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]