emacs: Improve crypto button labels.

Make the labels for both encryption and signature buttons share a common
format, in which both report the status if it is not one of those known.
This commit is contained in:
David Edmondson 2016-02-09 12:23:49 +00:00 committed by David Bremner
parent 4900cbee08
commit 3b63856568

View file

@ -110,8 +110,8 @@ mode."
(setq label (concat "Bad signature (claimed key ID " keyid ")")) (setq label (concat "Bad signature (claimed key ID " keyid ")"))
(setq face 'notmuch-crypto-signature-bad))) (setq face 'notmuch-crypto-signature-bad)))
(t (t
(setq label "Unknown signature status") (setq label (concat "Unknown signature status"
(if status (setq label (concat label " \"" status "\""))))) (if status (concat ": " status))))))
(insert-button (insert-button
(concat "[ " label " ]") (concat "[ " label " ]")
:type 'notmuch-crypto-status-button-type :type 'notmuch-crypto-status-button-type
@ -161,7 +161,8 @@ mode."
((string= status "bad") ((string= status "bad")
(setq label "Decryption error")) (setq label "Decryption error"))
(t (t
(setq label (concat "Unknown encstatus \"" status "\"")))) (setq label (concat "Unknown encryption status"
(if status (concat ": " status))))))
(insert-button (insert-button
(concat "[ " label " ]") (concat "[ " label " ]")
:type 'notmuch-crypto-status-button-type :type 'notmuch-crypto-status-button-type