better discard behavior for messages

git-svn-id: svn://rubyforge.org/var/svn/sup/trunk@540 5c8cc53c-5e98-4d25-b20a-d8db53a31250

diff --git a/lib/sup/modes/compose-mode.rb b/lib/sup/modes/compose-mode.rb
index fe7127956918dfd4154d48c67f5370b8705f2750..c1585926c644832879fd9a43384a550a9db3237e 100644 (file)
--- a/lib/sup/modes/compose-mode.rb
+++ b/lib/sup/modes/compose-mode.rb
@@ -13,6 +13,12 @@ class ComposeMode < EditMessageMode
 
     super :header => header, :body => (opts[:body] || [])
   end
+
+  def edit_message
+    edited = super
+    BufferManager.kill_buffer self.buffer unless edited
+    edited
+  end
 end
 
 end

diff --git a/lib/sup/modes/edit-message-mode.rb b/lib/sup/modes/edit-message-mode.rb
index 2c0314070c4a1bd43b9d369c85fdb6b438f7541b..3dc6717f0a90fc7f045a0ca9de412d5b3be53f5e 100644 (file)
--- a/lib/sup/modes/edit-message-mode.rb
+++ b/lib/sup/modes/edit-message-mode.rb
@@ -87,12 +87,14 @@ class EditMessageMode < LineCursorMode
     BufferManager.shell_out "#{editor} #{@file.path}"
     @edited = true if File.mtime(@file.path) > mtime
 
-    BufferManager.kill_buffer self.buffer unless @edited
+    return @edited unless @edited
 
     header, @body = parse_file @file.path
     @header = header - NON_EDITABLE_HEADERS
     handle_new_text @header, @body
     update
+
+    @edited
   end
 
   def killable?