From dec9ac476a85e6847dbb9e79b18f14374f0d566a Mon Sep 17 00:00:00 2001 From: yamaoka Date: Mon, 3 Mar 2003 10:44:23 +0000 Subject: [PATCH] Synch to OOrt Gnus. --- lisp/ChangeLog | 5 +++++ lisp/gnus-agent.el | 54 +++++++++++++++++++++++++++------------------------- 2 files changed, 33 insertions(+), 26 deletions(-) diff --git a/lisp/ChangeLog b/lisp/ChangeLog index b566fdf..b7ecc05 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog @@ -1,3 +1,8 @@ +2003-03-03 Lars Magne Ingebrigtsen + + * gnus-agent.el (gnus-agent-fetch-articles): Fix nil message. + (gnus-agent-fetch-session): Allow debugging to take place. + 2003-03-03 Jesper Harder * gnus-sum.el (gnus-highlight-selected-summary) diff --git a/lisp/gnus-agent.el b/lisp/gnus-agent.el index f344d73..0c80b63 100644 --- a/lisp/gnus-agent.el +++ b/lisp/gnus-agent.el @@ -1283,7 +1283,7 @@ This can be added to `gnus-select-article-hook' or (pop pos)))) (gnus-agent-save-alist group (cdr fetched-articles) date) - (gnus-message 7 nil)) + (gnus-message 7 "")) (cdr fetched-articles)))))) (defun gnus-agent-crosspost (crosses article &optional date) @@ -1741,31 +1741,33 @@ FILE and places the combined headers into `nntp-server-buffer'." groups group gnus-command-method) (save-excursion (while methods - (condition-case err - (progn - (setq gnus-command-method (car methods)) - (when (and (or (gnus-server-opened gnus-command-method) - (gnus-open-server gnus-command-method)) - (gnus-online gnus-command-method)) - (setq groups (gnus-groups-from-server (car methods))) - (gnus-agent-with-fetch - (while (setq group (pop groups)) - (when (<= (gnus-group-level group) - gnus-agent-handle-level) - (gnus-agent-fetch-group-1 - group gnus-command-method)))))) - (error - (unless (funcall gnus-agent-confirmation-function - (format "Error %s. Continue? " - (error-message-string err))) - (error "Cannot fetch articles into the Gnus agent"))) - (quit - (unless (funcall gnus-agent-confirmation-function - (format - "Quit fetching session %s. Continue? " - (error-message-string err))) - (signal 'quit - "Cannot fetch articles into the Gnus agent")))) + (setq gnus-command-method (car methods)) + (when (and (or (gnus-server-opened gnus-command-method) + (gnus-open-server gnus-command-method)) + (gnus-online gnus-command-method)) + (setq groups (gnus-groups-from-server (car methods))) + (gnus-agent-with-fetch + (while (setq group (pop groups)) + (when (<= (gnus-group-level group) + gnus-agent-handle-level) + (if (or debug-on-error debug-on-quit) + (gnus-agent-fetch-group-1 + group gnus-command-method) + (condition-case err + (gnus-agent-fetch-group-1 + group gnus-command-method) + (error + (unless (funcall gnus-agent-confirmation-function + (format "Error %s. Continue? " + (error-message-string err))) + (error "Cannot fetch articles into the Gnus agent"))) + (quit + (unless (funcall gnus-agent-confirmation-function + (format + "Quit fetching session %s. Continue? " + (error-message-string err))) + (signal 'quit + "Cannot fetch articles into the Gnus agent"))))))))) (pop methods)) (run-hooks 'gnus-agent-fetch-hook) (gnus-message 6 "Finished fetching articles into the Gnus agent")))) -- 1.7.10.4