From: Karl Fogel <kfogel@red-bean.com>
Date: Mon, 4 Nov 2019 20:39:14 +0000 (-0600)
Subject: Improve an error about the message signer
X-Git-Tag: emacs-27.0.90~680
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=06cb8350c69d96c686f17fdb2d1f9260cd16a0df;p=emacs.git

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.
---

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.  "
 	 (signers (mml-secure-signers context signer-names))
 	 signature micalg)
     (unless signers
-      (error "Couldn't find any signer names.  Perhaps `mml-secure-smime-sign-with-sender' should be set?"))
+      (let ((maybe-msg
+             (if mml-secure-smime-sign-with-sender
+                 "."
+               "; try setting `mml-secure-smime-sign-with-sender'.")))
+        ;; If `mml-secure-smime-sign-with-sender' is already non-nil
+        ;; then there's no point advising the user to examine it.  If
+        ;; there are any other variables worth examining, please
+        ;; improve this error message by having it mention them.
+        (error "Couldn't find any signer names%s" maybe-msg)))
     (when (eq 'OpenPGP protocol)
       (setf (epg-context-armor context) t)
       (setf (epg-context-textmode context) t)