[meld] filediff: Use our buffer variables consistently
- From: Kai Willadsen <kaiw src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [meld] filediff: Use our buffer variables consistently
- Date: Sat, 11 Mar 2017 01:54:49 +0000 (UTC)
commit 919016bbf7205bebfc542a6f8b7250e61f06f92e
Author: Kai Willadsen <kai willadsen gmail com>
Date: Sat Mar 11 11:45:05 2017 +1000
filediff: Use our buffer variables consistently
meld/filediff.py | 4 ++--
1 files changed, 2 insertions(+), 2 deletions(-)
---
diff --git a/meld/filediff.py b/meld/filediff.py
index 81a96ce..974886b 100644
--- a/meld/filediff.py
+++ b/meld/filediff.py
@@ -1797,10 +1797,10 @@ class FileDiff(melddoc.MeldDoc, gnomeglade.Component):
dst_end = b1.get_iter_at_line_or_eof(chunk[4])
t0 = b0.get_text(src_start, src_end, False)
mark0 = b1.create_mark(None, dst_start, True)
- self.textbuffer[dst].begin_user_action()
+ b1.begin_user_action()
b1.delete(dst_start, dst_end)
new_end = b1.insert_at_line(chunk[3], t0)
- self.textbuffer[dst].end_user_action()
+ b1.end_user_action()
mark1 = b1.create_mark(None, new_end, True)
if chunk[1] == chunk[2]:
# TODO: Need a more specific colour here; conflict is wrong
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]