[Emacs-diffs] /srv/bzr/emacs/trunk r105518: Introduce a new variable to allow controlling the SMTP user name

[Lars Magne Ingebrigtsen]

------------------------------------------------------------
revno: 105518
committer: Lars Magne Ingebrigtsen <address@hidden>
branch nick: trunk
timestamp: Sun 2011-08-21 06:11:59 +0200
message:
  Introduce a new variable to allow controlling the SMTP user name
  
  * mail/smtpmail.el (smtpmail-smtp-user): New variable.
  (smtpmail-try-auth-methods): Use it.
modified:
  lisp/ChangeLog
  lisp/mail/smtpmail.el

=== modified file 'lisp/ChangeLog'
--- a/lisp/ChangeLog    2011-08-21 03:00:52 +0000
+++ b/lisp/ChangeLog    2011-08-21 04:11:59 +0000
@@ -1,3 +1,8 @@
+2011-08-21  Lars Magne Ingebrigtsen  <address@hidden>
+
+       * mail/smtpmail.el (smtpmail-smtp-user): New variable.
+       (smtpmail-try-auth-methods): Use it.
+
 2011-08-21  Chong Yidong  <address@hidden>
 
        * font-lock.el (font-lock-fontify-region)

=== modified file 'lisp/mail/smtpmail.el'
--- a/lisp/mail/smtpmail.el     2011-08-17 22:02:49 +0000
+++ b/lisp/mail/smtpmail.el     2011-08-21 04:11:59 +0000
@@ -86,6 +86,11 @@
   :type '(choice (integer :tag "Port") (string :tag "Service"))
   :group 'smtpmail)
 
+(defcustom smtpmail-smtp-user nil
+  "User name to use when looking up credentials."
+  :type '(choice (const nil) string)
+  :group 'smtpmail)
+
 (defcustom smtpmail-local-domain nil
   "Local domain name without a host name.
 If the function `system-name' returns the full internet address,
@@ -490,6 +495,7 @@
                     (auth-source-search
                      :host host
                      :port port
+                     :user smtpmail-smtp-user
                      :max 1
                      :require (and ask-for-password
                                    '(:user :secret))
@@ -510,6 +516,7 @@
              :max 1
              :host host
              :port port
+             :user smtpmail-smtp-user
              :require '(:user :secret)
              :create t))
            password (plist-get auth-info :secret)))