[meld] filediff: Reorder apply_highlight to get the text as late as possible
- From: Kai Willadsen <kaiw src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [meld] filediff: Reorder apply_highlight to get the text as late as possible
- Date: Sun, 10 Jul 2016 00:54:18 +0000 (UTC)
commit 5548efe08f453971f9886f4953fbbef080b4d944
Author: Kai Willadsen <kai willadsen gmail com>
Date: Sun Jul 10 10:45:42 2016 +1000
filediff: Reorder apply_highlight to get the text as late as possible
This gives us better variable locality, but will is also about to let
us skip a small amount of work sometimes.
meld/filediff.py | 10 +++++-----
1 files changed, 5 insertions(+), 5 deletions(-)
---
diff --git a/meld/filediff.py b/meld/filediff.py
index d8cdc1f..1aaf675 100644
--- a/meld/filediff.py
+++ b/meld/filediff.py
@@ -1279,6 +1279,11 @@ class FileDiff(melddoc.MeldDoc, gnomeglade.Component):
continue
def apply_highlight(bufs, tags, start_marks, end_marks, texts, matches):
+ bufs[0].delete_mark(start_marks[0])
+ bufs[0].delete_mark(end_marks[0])
+ bufs[1].delete_mark(start_marks[1])
+ bufs[1].delete_mark(end_marks[1])
+
starts = [bufs[0].get_iter_at_mark(start_marks[0]),
bufs[1].get_iter_at_mark(start_marks[1])]
ends = [bufs[0].get_iter_at_mark(end_marks[0]),
@@ -1288,11 +1293,6 @@ class FileDiff(melddoc.MeldDoc, gnomeglade.Component):
textn = bufs[1].get_text(starts[1], ends[1], False)
textn = text_type(textn, 'utf8')
- bufs[0].delete_mark(start_marks[0])
- bufs[0].delete_mark(end_marks[0])
- bufs[1].delete_mark(start_marks[1])
- bufs[1].delete_mark(end_marks[1])
-
if texts != (text1, textn):
return
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]