summaryrefslogtreecommitdiff
path: root/lisp/mail/feedmail.el
diff options
context:
space:
mode:
authorTom Tromey <tromey@redhat.com>2013-06-03 12:25:05 -0600
committerTom Tromey <tromey@redhat.com>2013-06-03 12:25:05 -0600
commit68359abba96d7ec4db8aab3d3dd9cf1105c3bab5 (patch)
tree862703e7e1a1888170136a8296a5750d6b2ae2eb /lisp/mail/feedmail.el
parentcbcba8ce7f980b01c18c0fd561ef6687b1361507 (diff)
parente2d8a6f0a229b4ebe26484b892ec4f14888f58b6 (diff)
downloademacs-68359abba96d7ec4db8aab3d3dd9cf1105c3bab5.tar.gz
merge from trunk; clean up some issues
Diffstat (limited to 'lisp/mail/feedmail.el')
-rw-r--r--lisp/mail/feedmail.el7
1 files changed, 4 insertions, 3 deletions
diff --git a/lisp/mail/feedmail.el b/lisp/mail/feedmail.el
index 0502e7f9487..091b1a03025 100644
--- a/lisp/mail/feedmail.el
+++ b/lisp/mail/feedmail.el
@@ -370,9 +370,6 @@
(require 'mail-utils) ; pick up mail-strip-quoted-names
-(eval-when-compile
- (require 'smtpmail))
-
(autoload 'mail-do-fcc "sendmail")
(defgroup feedmail nil
@@ -1619,6 +1616,10 @@ local gurus."
;; These mean "report errors by mail" and "deliver in background".
(if (null mail-interactive) '("-oem" "-odb")))))
+(declare-function smtpmail-via-smtp "smtpmail"
+ (recipient smtpmail-text-buffer &optional ask-for-password))
+(defvar smtpmail-smtp-server)
+
;; provided by jam@austin.asc.slb.com (James A. McLaughlin);
;; simplified by WJC after more feedmail development;
;; idea (but not implementation) of copying smtpmail trace buffer to