Merge from gnus--rel--5.10

Patches applied:

 * emacs--devo--0  (patch 453-454, 459)

   - Update from CVS
   - Merge from gnus--rel--5.10

 * gnus--rel--5.10  (patch 145)

   - Merge from emacs--devo--0

2006-10-02  MIYOSHI Masanori <miyoshi@meadowy.org>  (tiny change)

   * contrib/mail/smtpmail.el (smtpmail-try-auth-methods): Fix typo in
   2006-09-28 commit.

2006-09-28  Osamu Yamane  <yamane@green.ocn.ne.jp> (tiny change)

   * contrib/mail/smtpmail.el (smtpmail-try-auth-methods): Do not break long
   lines in base64-encoded authentication response.

2006-09-25  Chong Yidong  <cyd@stupidchicken.com>

   * lisp/gnus-demon.el (gnus-demon): Use with-local-quit to avoid hangs.

Revision: emacs@sv.gnu.org/gnus--devo--0--patch-213

diff --git a/contrib/ChangeLog b/contrib/ChangeLog
index b1bc212..fe23bad 100644 (file)
--- a/contrib/ChangeLog
+++ b/contrib/ChangeLog
@@ -1,3 +1,13 @@
+2006-10-02  MIYOSHI Masanori <miyoshi@meadowy.org>  (tiny change)
+
+       * mail/smtpmail.el (smtpmail-try-auth-methods): Fix typo in
+       2006-09-28 commit.
+
+2006-09-28  Osamu Yamane  <yamane@green.ocn.ne.jp> (tiny change)
+
+       * mail/smtpmail.el (smtpmail-try-auth-methods): Do not break long
+       lines in base64-encoded authentication response.
+
 2006-09-04  Chong Yidong  <cyd@stupidchicken.com>
 
        * sendmail.el (sendmail-program): Moved here from pathe.el.

diff --git a/contrib/smtpmail.el b/contrib/smtpmail.el
index 3fc0477..9557844 100644 (file)
--- a/contrib/smtpmail.el
+++ b/contrib/smtpmail.el
@@ -541,7 +541,7 @@ This is relative to `smtpmail-queue-dir'.")
                 (decoded (base64-decode-string challenge))
                 (hash (rfc2104-hash 'md5 64 16 passwd decoded))
                 (response (concat (smtpmail-cred-user cred) " " hash))
-                (encoded (base64-encode-string response)))
+                (encoded (base64-encode-string response t)))
            (smtpmail-send-command process (format "%s" encoded))
            (if (or (null (car (setq ret (smtpmail-read-response process))))
                    (not (integerp (car ret)))
@@ -554,12 +554,12 @@ This is relative to `smtpmail-queue-dir'.")
                (>= (car ret) 400))
            (throw 'done nil))
        (smtpmail-send-command
-        process (base64-encode-string (smtpmail-cred-user cred)))
+        process (base64-encode-string (smtpmail-cred-user cred) t))
        (if (or (null (car (setq ret (smtpmail-read-response process))))
                (not (integerp (car ret)))
                (>= (car ret) 400))
            (throw 'done nil))
-       (smtpmail-send-command process (base64-encode-string passwd))
+       (smtpmail-send-command process (base64-encode-string passwd t))
        (if (or (null (car (setq ret (smtpmail-read-response process))))
                (not (integerp (car ret)))
                (>= (car ret) 400))
@@ -576,7 +576,7 @@ This is relative to `smtpmail-queue-dir'.")
                                        (concat "\0"
                                                (smtpmail-cred-user cred)
                                                "\0"
-                                               passwd))))
+                                               passwd) t)))
        (if (or (null (car (setq ret (smtpmail-read-response process))))
                (not (integerp (car ret)))
                (not (equal (car ret) 235)))

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 125fb1d..000667f 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -42,6 +42,10 @@
        * gnus-art.el (gnus-insert-prev-page-button)
        (gnus-insert-next-page-button): Apply gnus-article-button-face.
 
+2006-09-25  Chong Yidong  <cyd@stupidchicken.com>
+
+       * gnus-demon.el (gnus-demon): Use with-local-quit to avoid hangs.
+
 2006-09-20  Maxime Edouard Robert Froumentin  <max@lapin-bleu.net>
 
        (gnus-insert-mime-button, gnus-insert-mime-security-button): Apply

diff --git a/lisp/gnus-demon.el b/lisp/gnus-demon.el
index 5720b64..125710b 100644 (file)
--- a/lisp/gnus-demon.el
+++ b/lisp/gnus-demon.el
@@ -214,7 +214,7 @@ time Emacs has been idle for IDLE `gnus-demon-timestep's."
                   (< idle gnus-demon-idle-time)) ; Idle timed out.
                  (t (< 0 gnus-demon-idle-time)))) ; Or just need to be idle.
               ;; So we call the handler.
-              (progn
+              (with-local-quit
                 (ignore-errors (funcall (car handler)))
                 ;; And reset the timer.
                 (setcar (nthcdr 1 handler)
@@ -228,14 +228,15 @@ time Emacs has been idle for IDLE `gnus-demon-timestep's."
               (gnus-demon-is-idle-p))
          ;; We want to call this handler each and every time that
          ;; Emacs is idle.
-         (ignore-errors (funcall (car handler))))
+         (with-local-quit
+           (ignore-errors (funcall (car handler)))))
         (t
          ;; We want to call this handler only if Emacs has been idle
          ;; for a specified number of timesteps.
          (and (not (memq (car handler) gnus-demon-idle-has-been-called))
               (< idle gnus-demon-idle-time)
               (gnus-demon-is-idle-p)
-              (progn
+              (with-local-quit
                 (ignore-errors (funcall (car handler)))
                 ;; Make sure the handler won't be called once more in
                 ;; this idle-cycle.