mirrors/emacs
1
Fork 0
mirror of git://git.sv.gnu.org/emacs.git synced 2025-12-15 10:30:25 -08:00
Code Issues Projects Releases Wiki Activity

* mail/feedmail.el (feedmail-buffer-to-smtpmail):

Browse source 
`smtpmail-via-smtp' now returns the error instead of nil.
This commit is contained in:
Lars Magne Ingebrigtsen 2011-07-03 22:09:38 +02:00
parent c7f9804877
commit 6567659206
2 changed files with 18 additions and 16 deletions
Download patch file Download diff file Expand all files Collapse all files

3
lisp/ChangeLog
View file

@ -1,5 +1,8 @@
2011-07-03 Lars Magne Ingebrigtsen <larsi@gnus.org>
* mail/feedmail.el (feedmail-buffer-to-smtpmail):
`smtpmail-via-smtp' now returns the error instead of nil.
* isearch.el (isearch-search-fun-function): Clarify the doc string
(bug#8101).

31
lisp/mail/feedmail.el
View file

@ -1633,22 +1633,21 @@ local gurus."
;; no evil.
(feedmail-say-debug ">in-> feedmail-buffer-to-smtpmail %s" addr-listoid)
(require 'smtpmail)
(if (not (smtpmail-via-smtp addr-listoid prepped))
(progn
(set-buffer errors-to)
(insert "Send via smtpmail failed. Probable SMTP protocol error.\n")
(insert "Look for details below or in the *Messages* buffer.\n\n")
(let ((case-fold-search t)
;; don't be overconfident about the name of the trace buffer
(tracer (concat "trace.*smtp.*" (regexp-quote smtpmail-smtp-server))))
(mapcar
(lambda (buffy)
(if (string-match tracer (buffer-name buffy))
(progn
(insert "SMTP Trace from " (buffer-name buffy) "\n---------------")
(insert-buffer-substring buffy)
(insert "\n\n"))))
(buffer-list))))))
(let ((result (smtpmail-via-smtp addr-listoid prepped)))
(when result
(set-buffer errors-to)
(insert "Send via smtpmail failed: %s" result)
(let ((case-fold-search t)
;; don't be overconfident about the name of the trace buffer
(tracer (concat "trace.*smtp.*" (regexp-quote smtpmail-smtp-server))))
(mapcar
(lambda (buffy)
(if (string-match tracer (buffer-name buffy))
(progn
(insert "SMTP Trace from " (buffer-name buffy) "\n---------------")
(insert-buffer-substring buffy)
(insert "\n\n"))))
(buffer-list))))))
(declare-function smtp-via-smtp "ext:smtp" (sender recipients smtp-text-buffer))
(defvar smtp-server)