[meld] filediff, meldbuffer: Clarify some existing comments
- From: Kai Willadsen <kaiw src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [meld] filediff, meldbuffer: Clarify some existing comments
- Date: Sun, 31 Dec 2017 20:15:10 +0000 (UTC)
commit d26d56bba5dde04665c258d378330b9962f2649b
Author: Kai Willadsen <kai willadsen gmail com>
Date: Thu Dec 21 06:11:12 2017 +1000
filediff, meldbuffer: Clarify some existing comments
meld/filediff.py | 4 +++-
meld/meldbuffer.py | 7 ++++---
2 files changed, 7 insertions(+), 4 deletions(-)
---
diff --git a/meld/filediff.py b/meld/filediff.py
index b5328227..4b372e32 100644
--- a/meld/filediff.py
+++ b/meld/filediff.py
@@ -767,7 +767,9 @@ class FileDiff(melddoc.MeldDoc, gnomeglade.Component):
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
+ # TODO: We should have a diff-changed signal for the
+ # current buffer instead of passing everything through
+ # cursor change logic.
focused_pane = self._get_focused_pane()
if focused_pane != -1:
self.on_cursor_position_changed(self.textbuffer[focused_pane],
diff --git a/meld/meldbuffer.py b/meld/meldbuffer.py
index 71e2c12c..aaff77fb 100644
--- a/meld/meldbuffer.py
+++ b/meld/meldbuffer.py
@@ -192,9 +192,10 @@ class MeldBufferData(GObject.GObject):
self._sourcefile.bind_property(
'encoding', self, 'encoding', GObject.BindingFlags.DEFAULT)
- # This is aiming to maintain existing behaviour for filename. The
- # behaviour is however wrong and should be fixed.
- # FIXME: maintaining previous comment above; this is now wrong in different awful ways
+ # TODO: Figure out how we use filename, and decide on how this
+ # should actually work. This was previously wrong, but since
+ # then we've moved to Python 3 with a different filename
+ # encoding model, and also changed stuff to use Gio.File.
self.filename = value.get_path() if value else None
self.update_mtime()
self.connect_monitor()
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]