From 5c6561873ea572b104af05015df09087275dd9fb Mon Sep 17 00:00:00 2001 From: maxime Date: Sat, 2 Sep 2017 09:13:57 -0700 Subject: [PATCH] Warning the used abot obsolete variable Following code review (PR 1118): - Warn the user about the fact that the 'mu4e-compose-crypto-reply-policy' variable is deprecated - Removed a leftover debug message - Edited typo in the name of the new variable --- mu4e/mu4e-compose.el | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/mu4e/mu4e-compose.el b/mu4e/mu4e-compose.el index 1b1d0c25..bc40834d 100644 --- a/mu4e/mu4e-compose.el +++ b/mu4e/mu4e-compose.el @@ -162,7 +162,8 @@ We have the following choices: :safe 'symbolp :group 'mu4e-compose)) -(defcustom mu4e-compose-crypto-reply-plain-encrypted-policy 'sign "Policy for signing/encrypting replies to encrypted messages. +(defcustom mu4e-compose-crypto-reply-plain-policy 'sign + "Policy for signing/encrypting replies to messages received unencrypted. We have the following choices: - `sign': sign the reply @@ -177,6 +178,12 @@ We have the following choices: :safe 'symbolp :group 'mu4e-compose)) +(make-obsolete-variable mu4e-compose-crypto-reply-policy "The use of the + 'mu4e-compose-crypto-reply-policy' variable is deprecated. + 'mu4e-compose-crypto-reply-plain-policy' and + 'mu4e-compose-crypto-reply-encrypted-policy' should be used instead" + "2017-09-02") + (defcustom mu4e-compose-format-flowed nil "Whether to compose messages to be sent as format=flowed (or @@ -543,7 +550,6 @@ buffers; lets remap its faces so it uses the ones for mu4e." "When composing a reply to an encrypted message, we can automatically encrypt that reply. When the message is unencrypted, we can decide what we want to do." - (message "%S %S" parent compose-type) (if (and (eq compose-type 'reply) (and parent (member 'encrypted (mu4e-message-field parent :flags)))) (case mu4e-compose-crypto-reply-encrypted-policy