Commit 71f8b7ed authored by Gnus developers's avatar Gnus developers Committed by Katsumi Yamaoka
Browse files

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.
parent 28dd38e4
...@@ -44,6 +44,10 @@ ...@@ -44,6 +44,10 @@
* vc/vc-bzr.el (vc-bzr-state-heuristic): Handle dirstate entries * vc/vc-bzr.el (vc-bzr-state-heuristic): Handle dirstate entries
with no parents. (Bug#8025) with no parents. (Bug#8025)
   
2011-03-02 Teodor Zlatanov <tzz@lifelogs.com>
* password-cache.el (password-in-cache-p): Add autoload.
2011-03-02 Glenn Morris <rgm@gnu.org> 2011-03-02 Glenn Morris <rgm@gnu.org>
   
* man.el (Man-support-local-filenames): Also handle Red Hat's man. * man.el (Man-support-local-filenames): Also handle Red Hat's man.
......
2011-03-03 Tassilo Horn <tassilo@member.fsf.org>
* nnimap.el (nnimap-parse-flags): Add a workaround for FETCH lines with
numbers too big to be `read'.
2011-03-02 Teodor Zlatanov <tzz@lifelogs.com>
* message.el (message-options): Make buffer-local two ways to attempt
to fix a XEmacs bug.
2011-03-02 Julien Danjou <julien@danjou.info> 2011-03-02 Julien Danjou <julien@danjou.info>
   
* gnus-art.el (gnus-with-article-buffer): Fix buffer live check. * gnus-art.el (gnus-with-article-buffer): Fix buffer live check.
......
...@@ -1814,7 +1814,10 @@ You must have the \"hashcash\" binary installed, see `hashcash-path'." ...@@ -1814,7 +1814,10 @@ You must have the \"hashcash\" binary installed, see `hashcash-path'."
(defvar message-options nil (defvar message-options nil
"Some saved answers when sending message.") "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 (defvar message-send-mail-real-function nil
"Internal send mail function.") "Internal send mail function.")
......
...@@ -1496,10 +1496,22 @@ textual parts.") ...@@ -1496,10 +1496,22 @@ textual parts.")
(setq start (point)) (setq start (point))
(goto-char end)) (goto-char end))
(while (re-search-forward "^\\* [0-9]+ FETCH " start t) (while (re-search-forward "^\\* [0-9]+ FETCH " start t)
(setq elems (read (current-buffer))) (let ((p (point)))
(push (cons (cadr (memq 'UID elems)) ;; FIXME: For FETCH lines like "* 2971 FETCH (FLAGS (%Recent) UID
(cadr (memq 'FLAGS elems))) ;; 12509 MODSEQ (13419098521433281274))" we get an
articles)) ;; 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 (push (nconc (list group uidnext totalp permanent-flags uidvalidity
vanished highestmodseq) vanished highestmodseq)
articles) articles)
......
...@@ -76,6 +76,7 @@ regulate cache behavior." ...@@ -76,6 +76,7 @@ regulate cache behavior."
key key
(symbol-value (intern-soft key password-data)))) (symbol-value (intern-soft key password-data))))
;;;###autoload
(defun password-in-cache-p (key) (defun password-in-cache-p (key)
"Check if KEY is in the cache." "Check if KEY is in the cache."
(and password-cache (and password-cache
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment