* message.el (smtpmail-smtp-user): Silence compiler warning.

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 4e4d894..2bea734 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,7 @@
+2012-02-07  Lars Ingebrigtsen  <larsi@gnus.org>
+
+       * message.el (smtpmail-smtp-user): Silence compiler warning.
+
 2012-02-06  Lars Ingebrigtsen  <larsi@gnus.org>
 
        * message.el (message-multi-smtp-send-mail): Also allow specifying the

diff --git a/lisp/message.el b/lisp/message.el
index 77b23cb..96027a1 100644 (file)
--- a/lisp/message.el
+++ b/lisp/message.el
@@ -4702,6 +4702,7 @@ If you always want Gnus to send messages in one piece, set
     (push 'mail message-sent-message-via)))
 
 (defvar sendmail-program)
+(defvar smtpmail-smtp-user)
 
 (defun message-multi-smtp-send-mail ()
   "Send the current buffer to `message-send-mail-function'.
@@ -4716,6 +4717,7 @@ that instead."
        ((equal (car method) "sendmail")
        (message-send-mail-with-sendmail))
        ((equal (car method) "smtp")
+       (require 'smtpmail)
        (let ((smtpmail-smtp-server (nth 1 method))
              (smtpmail-smtp-service (nth 2 method))
              (smtpmail-smtp-user (or (nth 3 method) smtpmail-smtp-user)))