1 files changed, 17 insertions, 16 deletions
diff --git a/lisp/mail/reporter.el b/lisp/mail/reporter.el
index 9e1481a571b..5bda6c5d49a 100644
--- 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
+           (or (call-interactively
-            (if (nlistp reporter-mailer)
+                (if (nlistp reporter-mailer)
-                reporter-mailer
+                    reporter-mailer
-              (let ((mlist reporter-mailer)
+                  (let ((mlist reporter-mailer)
-                    (mailer nil))
+                        (mailer nil))
-                (while mlist
+                    (while mlist
-                  (if (commandp (car mlist))
+                      (if (commandp (car mlist))
-                      (setq mailer (car mlist)
+                          (setq mailer (car mlist)
-                            mlist nil)
+                                mlist nil)
-                    (setq mlist (cdr mlist))))
+                        (setq mlist (cdr mlist))))
-                (if (not mailer)
+                    (if (not mailer)
-                    (error
+                        (error
-                     "variable `%s' does not contain a command for mailing."
+                         "Variable `%s' does not contain a command for mailing"
-                     "reporter-mailer"))
+                         "reporter-mailer"))
-                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"))
      )))

diff --git a/lisp/mail/reporter.el b/lisp/mail/reporter.el index 9e1481a571b..5bda6c5d49a 100644 --- a/lisp/mail/reporter.el +++ b/lisp/mail/reporter.el
@@ -326,21 +326,22 @@ composed.")
326	(read-string "(Very) brief summary of problem: ")))	326	(read-string "(Very) brief summary of problem: ")))
327	(mailbuf	327	(mailbuf
328	(progn	328	(progn
329	(call-interactively	329	(or (call-interactively
330	(if (nlistp reporter-mailer)	330	(if (nlistp reporter-mailer)
331	reporter-mailer	331	reporter-mailer
332	(let ((mlist reporter-mailer)	332	(let ((mlist reporter-mailer)
333	(mailer nil))	333	(mailer nil))
334	(while mlist	334	(while mlist
335	(if (commandp (car mlist))	335	(if (commandp (car mlist))
336	(setq mailer (car mlist)	336	(setq mailer (car mlist)
337	mlist nil)	337	mlist nil)
338	(setq mlist (cdr mlist))))	338	(setq mlist (cdr mlist))))
339	(if (not mailer)	339	(if (not mailer)
340	(error	340	(error
341	"variable `%s' does not contain a command for mailing."	341	"Variable `%s' does not contain a command for mailing"
342	"reporter-mailer"))	342	"reporter-mailer"))
343	mailer)))	343	mailer)))
		344	(error "Bug report aborted"))
344	(current-buffer))))	345	(current-buffer))))
345	(require 'sendmail)	346	(require 'sendmail)
346	(pop-to-buffer reporter-eval-buffer)	347	(pop-to-buffer reporter-eval-buffer)
@@ -410,7 +411,7 @@ composed.")
410	(length reporter-initial-text))	411	(length reporter-initial-text))
411	(string= (buffer-substring after-sep-pos (point))	412	(string= (buffer-substring after-sep-pos (point))
412	reporter-initial-text))	413	reporter-initial-text))
413	(error "Empty bug report cannot be sent."))	414	(error "Empty bug report cannot be sent"))
414	)))	415	)))
415		416
416		417