(reporter-bug-hook): Fix error message.

(reporter-beautify-list): Break infloop when
reaching the end of the buffer without crossing an unbalanced
paren.  Use scan-sexps instead of forward-sexp for the loop break test.

(reporter-submit-bug-report): Only call
display-buffer if pop-up-windows is non-nil.

1 files changed, 2 insertions, 8 deletions

diff --git a/lisp/mail/reporter.el b/lisp/mail/reporter.el
index 59cea3ae4c6..ce245d76b85 100644
--- a/lisp/mail/reporter.el
+++ b/lisp/mail/reporter.el
@@ -305,12 +305,6 @@ composed.")
     (buffer-substring (match-beginning 0) (match-end 0))))
 
 
-;; Serves as an interface to `mail' (sendmail.el), but when the user
-;; answers "no" to discarding an unsent message, it gives an error.
-(defun reporter-mail (&rest args)
-  (or (apply 'mail args)
-      (error "Bug report aborted")))
-
 (defun reporter-compose-outgoing ()
   ;; compose the outgoing mail buffer, and return the selected
   ;; paradigm, with the current-buffer tacked onto the beginning of
@@ -319,11 +313,11 @@ composed.")
          (compose (get mail-user-agent 'composefunc)))
     ;; Sanity check.  If this fails then we'll try to use the SENDMAIL
     ;; protocol, otherwise we must signal an error.
-    (if (not (and compose (fboundp compose)))
+    (if (not (and compose (functionp compose)))
         (progn
           (setq agent 'sendmail-user-agent
                 compose (get agent 'composefunc))
-          (if (not (and compose (fboundp compose)))
+          (if (not (and compose (functionp compose)))
               (error "Could not find a valid `mail-user-agent'")
             (ding)
             (message "`%s' is an invalid `mail-user-agent'; using `sendmail-user-agent'"