[Emacs-diffs] /srv/bzr/emacs/trunk r105558: Minor smtpmail.el fixes.

[Glenn Morris]

------------------------------------------------------------
revno: 105558
committer: Glenn Morris <address@hidden>
branch nick: trunk
timestamp: Wed 2011-08-24 20:41:03 -0400
message:
  Minor smtpmail.el fixes.
  
  * lisp/mail/smtpmail.el (smtpmail-smtp-user): Add version: tag.
  (smtpmail-via-smtp): Handle nil response from smtp.
modified:
  lisp/ChangeLog
  lisp/mail/smtpmail.el

=== modified file 'lisp/ChangeLog'
--- a/lisp/ChangeLog    2011-08-24 18:09:18 +0000
+++ b/lisp/ChangeLog    2011-08-25 00:41:03 +0000
@@ -1,3 +1,8 @@
+2011-08-25  Glenn Morris  <address@hidden>
+
+       * mail/smtpmail.el (smtpmail-smtp-user): Add version: tag.
+       (smtpmail-via-smtp): Handle nil response from smtp.
+
 2011-08-24  Juri Linkov  <address@hidden>
 
        * proced.el (proced-marked): Inherit from `error' instead of

=== modified file 'lisp/mail/smtpmail.el'
--- a/lisp/mail/smtpmail.el     2011-08-21 20:29:11 +0000
+++ b/lisp/mail/smtpmail.el     2011-08-25 00:41:03 +0000
@@ -88,6 +88,7 @@
 
 (defcustom smtpmail-smtp-user nil
   "User name to use when looking up credentials."
+  :version "24.1"
   :type '(choice (const nil) string)
   :group 'smtpmail)
 
@@ -677,7 +678,7 @@
              (throw 'done (format "No greeting: %s" greeting)))
            (when (>= code 400)
              (throw 'done (format "Connection not allowed: %s" greeting))))
-         
+
          (with-current-buffer process-buffer
            (set-buffer-process-coding-system 'raw-text-unix 'raw-text-unix)
            (make-local-variable 'smtpmail-read-point)
@@ -730,7 +731,7 @@
 
            (when (member 'xusr supported-extensions)
              (smtpmail-command-or-throw process (format "XUSR")))
-           
+
            ;; MAIL FROM:<sender>
            (let ((size-part
                   (if (or (member 'size supported-extensions)
@@ -769,7 +770,7 @@
                )
               ((and auth-mechanisms
                     (not ask-for-password)
-                    (= (car result) 530))
+                    (eq (car result) 530))
                ;; We got a "530 auth required", so we close and try
                ;; again, this time asking the user for a password.
                (smtpmail-send-command process "QUIT")
@@ -796,6 +797,7 @@
                  nil)
                 ((and auth-mechanisms
                       (not ask-for-password)
+                      (integerp (car result))
                       (>= (car result) 550)
                       (<= (car result) 554))
                  ;; We got a "550 relay not permitted" (or the like),