Skip to content
GitLab
Projects
Groups
Snippets
Help
Loading...
Help
What's new
7
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
Open sidebar
emacs
emacs
Commits
65676592
Commit
65676592
authored
Jul 03, 2011
by
Lars Magne Ingebrigtsen
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
* mail/feedmail.el (feedmail-buffer-to-smtpmail):
`smtpmail-via-smtp' now returns the error instead of nil.
parent
c7f98048
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
18 additions
and
16 deletions
+18
-16
lisp/ChangeLog
lisp/ChangeLog
+3
-0
lisp/mail/feedmail.el
lisp/mail/feedmail.el
+15
-16
No files found.
lisp/ChangeLog
View file @
65676592
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).
...
...
lisp/mail/feedmail.el
View file @
65676592
...
...
@@ -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
)
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment