aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorKarl Fogel2019-11-04 14:39:14 -0600
committerKarl Fogel2019-11-09 15:30:09 -0500
commit06cb8350c69d96c686f17fdb2d1f9260cd16a0df (patch)
treed3662919411c35fce971f9fc93f5e2d62f66bfc9
parenta67b51e92bb36b32f88dca01c3cd3da02b3dfb99 (diff)
downloademacs-06cb8350c69d96c686f17fdb2d1f9260cd16a0df.tar.gz
emacs-06cb8350c69d96c686f17fdb2d1f9260cd16a0df.zip
Improve an error about the message signer
* lisp/gnus/mml-sec.el (mml-secure-epg-sign): Don't suggest setting `mml-secure-smime-sign-with-sender' if it's already non-nil.
-rw-r--r--lisp/gnus/mml-sec.el10
1 files changed, 9 insertions, 1 deletions
diff --git a/lisp/gnus/mml-sec.el b/lisp/gnus/mml-sec.el
index c7a2d4664e8..a1f5b6386b2 100644
--- a/lisp/gnus/mml-sec.el
+++ b/lisp/gnus/mml-sec.el
@@ -945,7 +945,15 @@ If no one is selected, symmetric encryption will be performed. "
945 (signers (mml-secure-signers context signer-names)) 945 (signers (mml-secure-signers context signer-names))
946 signature micalg) 946 signature micalg)
947 (unless signers 947 (unless signers
948 (error "Couldn't find any signer names. Perhaps `mml-secure-smime-sign-with-sender' should be set?")) 948 (let ((maybe-msg
949 (if mml-secure-smime-sign-with-sender
950 "."
951 "; try setting `mml-secure-smime-sign-with-sender'.")))
952 ;; If `mml-secure-smime-sign-with-sender' is already non-nil
953 ;; then there's no point advising the user to examine it. If
954 ;; there are any other variables worth examining, please
955 ;; improve this error message by having it mention them.
956 (error "Couldn't find any signer names%s" maybe-msg)))
949 (when (eq 'OpenPGP protocol) 957 (when (eq 'OpenPGP protocol)
950 (setf (epg-context-armor context) t) 958 (setf (epg-context-armor context) t)
951 (setf (epg-context-textmode context) t) 959 (setf (epg-context-textmode context) t)