[meld] Cleanup inline highlighting
- From: Kai Willadsen <kaiw src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [meld] Cleanup inline highlighting
- Date: Wed, 6 Oct 2010 20:18:53 +0000 (UTC)
commit f00343521ea0e824830187d95f37556f8ccf5985
Author: Kai Willadsen <kai willadsen gmail com>
Date: Wed Oct 6 17:26:12 2010 +1000
Cleanup inline highlighting
meld/filediff.py | 6 ++----
1 files changed, 2 insertions(+), 4 deletions(-)
---
diff --git a/meld/filediff.py b/meld/filediff.py
index 03c3ca8..7f26255 100644
--- a/meld/filediff.py
+++ b/meld/filediff.py
@@ -936,10 +936,8 @@ class FileDiff(melddoc.MeldDoc, gnomeglade.Component):
bufs[0].remove_tag(tags[0], starts[0], ends[0])
bufs[1].remove_tag(tags[1], starts[1], ends[1])
- text1 = "\n".join(alltexts[1][c[1]:c[2]] ).encode("utf16")
- text1 = struct.unpack("%iH"%(len(text1)/2), text1)[1:]
- textn = "\n".join(alltexts[i*2][c[3]:c[4]] ).encode("utf16")
- textn = struct.unpack("%iH"%(len(textn)/2), textn)[1:]
+ text1 = "\n".join(alltexts[1][c[1]:c[2]])
+ textn = "\n".join(alltexts[i * 2][c[3]:c[4]])
# For very long sequences, bail rather than trying a very slow comparison
inline_limit = 8000 # arbitrary constant
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]