[meld] filediff: Don't disable updating when syncpoints aren't yet active
- From: Kai Willadsen <kaiw src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [meld] filediff: Don't disable updating when syncpoints aren't yet active
- Date: Fri, 13 Dec 2013 23:00:15 +0000 (UTC)
commit cd96a6ecd251c567b6346f5c782b71e0653d1e49
Author: Kai Willadsen <kai willadsen gmail com>
Date: Sat Dec 14 08:57:15 2013 +1000
filediff: Don't disable updating when syncpoints aren't yet active
This is a problem if, for example, the user sets a syncpoint in the
left pane without setting one in the right pane. We need matching
syncpoints in each pane to do the syncing so don't actually sync and
don't show our warning, but we do disable comparison updating.
This patch changes this so that we only disable comparison updating
if the actual differ has a list of syncpoints that it's using.
meld/filediff.py | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
---
diff --git a/meld/filediff.py b/meld/filediff.py
index 751dd42..b4e9bd5 100644
--- a/meld/filediff.py
+++ b/meld/filediff.py
@@ -781,7 +781,7 @@ class FileDiff(melddoc.MeldDoc, gnomeglade.Component):
def _after_text_modified(self, buffer, startline, sizechange):
if self.num_panes > 1:
pane = self.textbuffer.index(buffer)
- if not self.syncpoints:
+ if not self.linediffer.syncpoints:
self.linediffer.change_sequence(pane, startline, sizechange,
self.buffer_filtered)
# FIXME: diff-changed signal for the current buffer would be cleaner
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]