From mboxrd@z Thu Jan 1 00:00:00 1970 From: cworth@cworth.org (Carl Worth) Date: Mon, 28 Sep 2009 15:57:38 -0700 Subject: [sup-talk] [PATCH] Add new :crypto_default configuration option. Message-ID: <1254178611-sup-369@yoom.home.cworth.org> For example, users that want to sign all outgoing messages by default can set: :crypto_default: :sign in ~/.sup/config.yaml. Configuring an invalid value will cause a list of the valid values to be logged at the "error" level. --- lib/sup/horizontal-selector.rb | 8 +++++++- lib/sup/modes/edit-message-mode.rb | 7 ++++++- 2 files changed, 13 insertions(+), 2 deletions(-) diff --git a/lib/sup/horizontal-selector.rb b/lib/sup/horizontal-selector.rb index aef16d4..13c63ed 100644 --- a/lib/sup/horizontal-selector.rb +++ b/lib/sup/horizontal-selector.rb @@ -12,7 +12,13 @@ class HorizontalSelector @selection = 0 end - def set_to val; @selection = @vals.index(val) end + def set_to val + if @vals.index(val) + @selection = @vals.index(val) + else + error "Invalid option ", val.inspect, " (valid options: ", @vals.inspect, ")" + end + end def val; @vals[@selection] end diff --git a/lib/sup/modes/edit-message-mode.rb b/lib/sup/modes/edit-message-mode.rb index 8da316f..3449503 100644 --- a/lib/sup/modes/edit-message-mode.rb +++ b/lib/sup/modes/edit-message-mode.rb @@ -89,7 +89,12 @@ EOS if CryptoManager.have_crypto? HorizontalSelector.new "Crypto:", [:none] + CryptoManager::OUTGOING_MESSAGE_OPERATIONS.keys, ["None"] + CryptoManager::OUTGOING_MESSAGE_OPERATIONS.values end - add_selector @crypto_selector if @crypto_selector + if @crypto_selector + if !$config[:crypto_default].nil? + @crypto_selector.set_to $config[:crypto_default] + end + add_selector @crypto_selector + end HookManager.run "before-edit", :header => @header, :body => @body -- 1.6.4.3 -------------- next part -------------- A non-text attachment was scrubbed... Name: signature.asc Type: application/pgp-signature Size: 190 bytes Desc: not available URL: