(reporter-submit-bug-report): Give up if mailer

command returns nil.  Fix error message syntax.
(reporter-bug-hook): Fix error message syntax.

diff --git a/lisp/mail/reporter.el b/lisp/mail/reporter.el
index 9e1481a571b3c102df67e135c328cbc080fa823f..5bda6c5d49a6f94a55164df6d651fd21d4f091b3 100644 (file)
--- a/lisp/mail/reporter.el
+++ b/lisp/mail/reporter.el
@@ -326,21 +326,22 @@ composed.")
                      (read-string "(Very) brief summary of problem: ")))
        (mailbuf
         (progn
-          (call-interactively
-           (if (nlistp reporter-mailer)
-               reporter-mailer
-             (let ((mlist reporter-mailer)
-                   (mailer nil))
-               (while mlist
-                 (if (commandp (car mlist))
-                     (setq mailer (car mlist)
-                           mlist nil)
-                   (setq mlist (cdr mlist))))
-               (if (not mailer)
-                   (error
-                    "variable `%s' does not contain a command for mailing."
-                    "reporter-mailer"))
-               mailer)))
+          (or (call-interactively
+               (if (nlistp reporter-mailer)
+                   reporter-mailer
+                 (let ((mlist reporter-mailer)
+                       (mailer nil))
+                   (while mlist
+                     (if (commandp (car mlist))
+                         (setq mailer (car mlist)
+                               mlist nil)
+                       (setq mlist (cdr mlist))))
+                   (if (not mailer)
+                       (error
+                        "Variable `%s' does not contain a command for mailing"
+                        "reporter-mailer"))
+                   mailer)))
+              (error "Bug report aborted"))
           (current-buffer))))
     (require 'sendmail)
     (pop-to-buffer reporter-eval-buffer)
@@ -410,7 +411,7 @@ composed.")
                  (length reporter-initial-text))
               (string= (buffer-substring after-sep-pos (point))
                        reporter-initial-text))
-         (error "Empty bug report cannot be sent."))
+         (error "Empty bug report cannot be sent"))
       )))
 
 \f