[meld] Minor cleanups

[Kai Willadsen <kaiw src gnome org>]

commit 13cea14f24bfccd450384d4b2b46b4413f9a220a
Author: Kai Willadsen <kai willadsen gmail com>
Date:   Tue Sep 25 06:06:46 2012 +1000

    Minor cleanups

 meld/filediff.py  |    1 -
 meld/filemerge.py |    5 +----
 2 files changed, 1 insertions(+), 5 deletions(-)
---
diff --git a/meld/filediff.py b/meld/filediff.py
index 0269cce..38e6bad 100644
--- a/meld/filediff.py
+++ b/meld/filediff.py
@@ -1046,7 +1046,6 @@ class FileDiff(melddoc.MeldDoc, gnomeglade.Component):
             srcviewer.set_language(self.textbuffer[i], langs[i])
             srcviewer.set_highlight_syntax(self.textbuffer[i],
                                            self.prefs.use_syntax_highlighting)
-        yield 0
 
     def _set_files_internal(self, files):
         for i in self._load_files(files, self.textbuffer):
diff --git a/meld/filemerge.py b/meld/filemerge.py
index c83888c..66faab6 100644
--- a/meld/filemerge.py
+++ b/meld/filemerge.py
@@ -41,20 +41,17 @@ class FileMerge(filediff.FileDiff):
         self.textview[1].set_buffer(self.textbuffer[1])
         for i in self._diff_files():
             yield i
-        filediff.FileDiff.set_buffer_writable(self, self.textbuffer[1], True)
 
     def _merge_files(self):
-        yield _("[%s] Computing differences") % self.label_text
+        yield _("[%s] Merging files") % self.label_text
         merger = merge.Merger()
         step = merger.initialize(self.buffer_filtered, self.buffer_texts)
         while step.next() is None:
             yield 1
-        yield _("[%s] Merging files") % self.label_text
         for merged_text in merger.merge_3_files():
             yield 1
         self.linediffer.unresolved = merger.unresolved
         self.textbuffer[1].set_text(merged_text)
         self.textbuffer[1].data.modified = True
         self.recompute_label()
-        yield 1