[Emacs-diffs] /srv/bzr/emacs/trunk r103501: Merge changes made in Gnus trunk.

[Katsumi Yamaoka]

------------------------------------------------------------
revno: 103501
author: Gnus developers <address@hidden>
committer: Katsumi Yamaoka <address@hidden>
branch nick: trunk
timestamp: Thu 2011-03-03 13:21:50 +0000
message:
  Merge changes made in Gnus trunk.
  
  nnimap.el (nnimap-parse-flags): Add a workaround for FETCH lines with numbers 
too big to be `read'.
  password-cache.el (password-in-cache-p): Add autoload.
  message.el (message-options): Make buffer-local two ways to attempt to fix a 
XEmacs bug.
modified:
  lisp/ChangeLog
  lisp/gnus/ChangeLog
  lisp/gnus/message.el
  lisp/gnus/nnimap.el
  lisp/password-cache.el

=== modified file 'lisp/ChangeLog'
--- a/lisp/ChangeLog    2011-03-03 09:10:19 +0000
+++ b/lisp/ChangeLog    2011-03-03 13:21:50 +0000
@@ -44,6 +44,10 @@
        * vc/vc-bzr.el (vc-bzr-state-heuristic): Handle dirstate entries
        with no parents.  (Bug#8025)
 
+2011-03-02  Teodor Zlatanov  <address@hidden>
+
+       * password-cache.el (password-in-cache-p): Add autoload.
+
 2011-03-02  Glenn Morris  <address@hidden>
 
        * man.el (Man-support-local-filenames): Also handle Red Hat's man.

=== modified file 'lisp/gnus/ChangeLog'
--- a/lisp/gnus/ChangeLog       2011-03-02 12:34:12 +0000
+++ b/lisp/gnus/ChangeLog       2011-03-03 13:21:50 +0000
@@ -1,3 +1,13 @@
+2011-03-03  Tassilo Horn  <address@hidden>
+
+       * nnimap.el (nnimap-parse-flags): Add a workaround for FETCH lines with
+       numbers too big to be `read'.
+
+2011-03-02  Teodor Zlatanov  <address@hidden>
+
+       * message.el (message-options): Make buffer-local two ways to attempt
+       to fix a XEmacs bug.
+
 2011-03-02  Julien Danjou  <address@hidden>
 
        * gnus-art.el (gnus-with-article-buffer): Fix buffer live check.

=== modified file 'lisp/gnus/message.el'
--- a/lisp/gnus/message.el      2011-02-15 11:24:37 +0000
+++ b/lisp/gnus/message.el      2011-03-03 13:21:50 +0000
@@ -1814,7 +1814,10 @@
 
 (defvar        message-options nil
   "Some saved answers when sending message.")
-(make-variable-buffer-local 'message-options)
+
+(if (featurep 'xemacs)
+    (make-local-variable 'message-options)
+  (make-variable-buffer-local 'message-options))
 
 (defvar message-send-mail-real-function nil
   "Internal send mail function.")

=== modified file 'lisp/gnus/nnimap.el'
--- a/lisp/gnus/nnimap.el       2011-02-25 12:53:00 +0000
+++ b/lisp/gnus/nnimap.el       2011-03-03 13:21:50 +0000
@@ -1496,10 +1496,22 @@
            (setq start (point))
            (goto-char end))
          (while (re-search-forward "^\\* [0-9]+ FETCH " start t)
-           (setq elems (read (current-buffer)))
-           (push (cons (cadr (memq 'UID elems))
-                       (cadr (memq 'FLAGS elems)))
-                 articles))
+           (let ((p (point)))
+             ;; FIXME: For FETCH lines like "* 2971 FETCH (FLAGS (%Recent) UID
+             ;; 12509 MODSEQ (13419098521433281274))" we get an
+             ;; overflow-error.  The handler simply deletes that large number
+             ;; and reads again.  But maybe there's a better fix...
+             (setq elems (condition-case nil (read (current-buffer))
+                           (overflow-error
+                            ;; After an overflow-error, point is just after
+                            ;; the too large number.  So delete it and try
+                            ;; again.
+                            (delete-region (point) (progn (backward-word) 
(point)))
+                            (goto-char p)
+                            (read (current-buffer)))))
+             (push (cons (cadr (memq 'UID elems))
+                         (cadr (memq 'FLAGS elems)))
+                   articles)))
          (push (nconc (list group uidnext totalp permanent-flags uidvalidity
                             vanished highestmodseq)
                       articles)

=== modified file 'lisp/password-cache.el'
--- a/lisp/password-cache.el    2011-02-25 23:52:19 +0000
+++ b/lisp/password-cache.el    2011-03-03 13:21:50 +0000
@@ -76,6 +76,7 @@
        key
        (symbol-value (intern-soft key password-data))))
 
+;;;###autoload
 (defun password-in-cache-p (key)
   "Check if KEY is in the cache."
   (and password-cache