[Emacs-diffs] trunk r113821: * mail/sendmail.el (sendmail-send-it): Don't kill the error buffer on error

[Lars Ingebrigtsen]

------------------------------------------------------------
revno: 113821
revision-id: address@hidden
parent: address@hidden
author: Grégoire Jadi <address@hidden>
committer: Lars Magne Ingebrigtsen <address@hidden>
branch nick: trunk
timestamp: Mon 2013-08-12 19:25:22 +0200
message:
  * mail/sendmail.el (sendmail-send-it): Don't kill the error buffer on error
  
  This makes debugging easier.
modified:
  lisp/ChangeLog                 changelog-20091113204419-o5vbwnq5f7feedwu-1432
  lisp/mail/sendmail.el          sendmail.el-20091113204419-o5vbwnq5f7feedwu-290

=== modified file 'lisp/ChangeLog'
--- a/lisp/ChangeLog    2013-08-12 15:11:35 +0000
+++ b/lisp/ChangeLog    2013-08-12 17:25:22 +0000
@@ -1,3 +1,8 @@
+2013-08-12  Grégoire Jadi  <address@hidden>
+
+       * mail/sendmail.el (sendmail-send-it): Don't kill the error buffer
+       if sending fails.  This makes debugging easier.
+
 2013-08-12  Juanma Barranquero  <address@hidden>
 
        * xml.el (xml-parse-tag-1): Use looking-at (this reverts change in

=== modified file 'lisp/mail/sendmail.el'
--- a/lisp/mail/sendmail.el     2013-01-13 19:48:04 +0000
+++ b/lisp/mail/sendmail.el     2013-08-12 17:25:22 +0000
@@ -1114,6 +1114,7 @@
   (let ((errbuf (if mail-interactive
                    (generate-new-buffer " sendmail errors")
                  0))
+        (error nil)
        (tembuf (generate-new-buffer " sendmail temp"))
        (multibyte enable-multibyte-characters)
        (case-fold-search nil)
@@ -1278,10 +1279,13 @@
                     (exit-value (apply 'call-process-region args)))
                (cond ((or (null exit-value) (eq 0 exit-value)))
                      ((numberp exit-value)
+                       (setq error t)
                       (error "Sending...failed with exit value %d" exit-value))
                      ((stringp exit-value)
+                       (setq error t)
                       (error "Sending...terminated by signal: %s" exit-value))
                      (t
+                       (setq error t)
                       (error "SENDMAIL-SEND-IT -- fall through: %S" 
exit-value))))
            (or fcc-was-found
                (error "No recipients")))
@@ -1290,12 +1294,15 @@
                (goto-char (point-min))
                (while (re-search-forward "\n\n* *" nil t)
                  (replace-match "; "))
-               (if (not (zerop (buffer-size)))
-                   (error "Sending...failed to %s"
-                          (buffer-substring (point-min) (point-max)))))))
+               (unless (zerop (buffer-size))
+                  (setq error t)
+                  (error "Sending...failed to %s"
+                         (buffer-substring (point-min) (point-max)))))))
       (kill-buffer tembuf)
-      (if (bufferp errbuf)
-         (kill-buffer errbuf)))))
+      (if (and (bufferp errbuf)
+               (not error))
+          (kill-buffer errbuf)
+        (switch-to-buffer-other-window errbuf)))))
 
 (autoload 'rmail-output-to-rmail-buffer "rmailout")