lib/sup/modes/edit_message_mode.rb in sup-0.16.0 vs lib/sup/modes/edit_message_mode.rb in sup-0.17.0

@@ -77,12 +77,12 @@
     k.add :send_message, "Send message", 'y'
     k.add :edit_message_or_field, "Edit selected field", 'e'
     k.add :edit_to, "Edit To:", 't'
     k.add :edit_cc, "Edit Cc:", 'c'
     k.add :edit_subject, "Edit Subject", 's'
-    k.add :edit_message, "Edit message", :enter
-    k.add :edit_message_async, "Edit message asynchronously", 'E'
+    k.add :default_edit_message, "Edit message (default)", :enter
+    k.add :alternate_edit_message, "Edit message (alternate, asynchronously)", 'E'
     k.add :save_as_draft, "Save as draft", 'P'
     k.add :attach_file, "Attach a file", 'a'
     k.add :delete_attachment, "Delete an attachment", 'd'
     k.add :move_cursor_right, "Move selector to the right", :right, 'l'
     k.add :move_cursor_left, "Move selector to the left", :left, 'h'
@@ -103,11 +103,11 @@
     end
 
     begin
       hostname = File.open("/etc/mailname", "r").gets.chomp
     rescue
-        nil
+      nil
     end
     hostname = Socket.gethostname if hostname.nil? or hostname.empty?
 
     @message_id = "<#{Time.now.to_i}-sup-#{rand 10000}@#{hostname}>"
     @edited = false
@@ -180,11 +180,11 @@
   def edit_message_or_field
     lines = (@selectors.empty? ? 0 : DECORATION_LINES) + @selectors.size
     if lines > curpos
       return
     elsif (curpos - lines) >= @header_lines.length
-      edit_message
+      default_edit_message
     else
       edit_field @header_lines[curpos - lines]
     end
   end
 
@@ -221,9 +221,25 @@
         @sig_edited = false
         @body = pbody[0..blen-slen].fix_encoding!.split("\n")
       else
         @sig_edited = true
       end
+    end
+  end
+
+  def default_edit_message
+    if $config[:always_edit_async]
+      return edit_message_async
+    else
+      return edit_message
+    end
+  end
+
+  def alternate_edit_message
+    if $config[:always_edit_async]
+      return edit_message
+    else
+      return edit_message_async
     end
   end
 
   def edit_message
     old_from = @header["From"] if @account_selector