From 582c0a4d881d677ee235a66b211cc80dad8eec19 Mon Sep 17 00:00:00 2001 From: yamaoka Date: Sun, 9 Jun 2002 22:15:20 +0000 Subject: [PATCH] Synch with Oort Gnus. --- lisp/ChangeLog | 10 ++++++++++ lisp/flow-fill.el | 12 +++++++----- lisp/gnus-int.el | 16 ++++++++++++---- lisp/gnus-sum.el | 8 ++------ 4 files changed, 31 insertions(+), 15 deletions(-) diff --git a/lisp/ChangeLog b/lisp/ChangeLog index 1075ae5..8dd4e76 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog @@ -1,3 +1,13 @@ +2002-06-09 Simon Josefsson + + * gnus-sum.el (gnus-summary-delete-article): Don't agent expire here. + + * gnus-int.el (gnus-request-expire-articles): Do it here instead. + +2002-06-08 ShengHuo ZHU + + * flow-fill.el (fill-flowed): Ignore errors. + 2002-06-06 Simon Josefsson * message.el (message-send-mail-with-sendmail): Improve error message. diff --git a/lisp/flow-fill.el b/lisp/flow-fill.el index dfe09c2..c72ad40 100644 --- a/lisp/flow-fill.el +++ b/lisp/flow-fill.el @@ -134,11 +134,13 @@ RFC 2646 suggests 66 characters for readability." (backward-delete-char -1) (end-of-line)) (unless sig - (let ((fill-prefix (when quote (concat quote " "))) - (fill-column (eval fill-flowed-display-column))) - (fill-region (fill-flowed-point-at-bol) - (min (1+ (fill-flowed-point-at-eol)) (point-max)) - 'left 'nosqueeze)))))))) + (condition-case nil + (let ((fill-prefix (when quote (concat quote " "))) + (fill-column (eval fill-flowed-display-column))) + (fill-region (fill-flowed-point-at-bol) + (min (1+ (fill-flowed-point-at-eol)) (point-max)) + 'left 'nosqueeze)) + (error nil)))))))) (provide 'flow-fill) diff --git a/lisp/gnus-int.el b/lisp/gnus-int.el index 330b300..a4a9b1f 100644 --- a/lisp/gnus-int.el +++ b/lisp/gnus-int.el @@ -398,6 +398,7 @@ If BUFFER, insert the article in that group." (gnus-cache-request-article article group)) (setq res (cons group article) clean-up t)) + ;; Check the agent cache. ((and gnus-agent gnus-agent-cache gnus-plugged (numberp article) (gnus-agent-request-article article group)) @@ -484,10 +485,17 @@ If GROUP is nil, all groups on GNUS-COMMAND-METHOD are scanned." info (nth 1 gnus-command-method)))) (defun gnus-request-expire-articles (articles group &optional force) - (let ((gnus-command-method (gnus-find-method-for-group group))) - (funcall (gnus-get-function gnus-command-method 'request-expire-articles) - articles (gnus-group-real-name group) (nth 1 gnus-command-method) - force))) + (let ((gnus-command-method (gnus-find-method-for-group group)) + (not-deleted + (funcall + (gnus-get-function gnus-command-method 'request-expire-articles) + articles (gnus-group-real-name group) (nth 1 gnus-command-method) + force))) + (when (and gnus-agent gnus-agent-cache + (gnus-sorted-difference articles not-deleted)) + (gnus-agent-expire (gnus-sorted-difference articles not-deleted) + gnus-newsgroup-name 'force)) + not-deleted)) (defun gnus-request-move-article (article group server accept-function &optional last) diff --git a/lisp/gnus-sum.el b/lisp/gnus-sum.el index bf3ac53..bbb81a6 100644 --- a/lisp/gnus-sum.el +++ b/lisp/gnus-sum.el @@ -54,7 +54,7 @@ (autoload 'gnus-mailing-list-insinuate "gnus-ml" nil t) (autoload 'turn-on-gnus-mailing-list-mode "gnus-ml" nil t) (autoload 'mm-uu-dissect "mm-uu") -(autoload 'gnus-article-outlook-deuglify-article "deuglify" +(autoload 'gnus-article-outlook-deuglify-article "deuglify" "Deuglify broken Outlook (Express) articles and redisplay." t) @@ -8984,10 +8984,6 @@ delete these instead." ;; Delete the articles. (setq not-deleted (gnus-request-expire-articles articles gnus-newsgroup-name 'force)) - (when (and gnus-agent gnus-agent-cache - (gnus-sorted-difference articles not-deleted)) - (gnus-agent-expire (gnus-sorted-difference articles not-deleted) - gnus-newsgroup-name 'force)) (while articles (gnus-summary-remove-process-mark (car articles)) ;; The backend might not have been able to delete the article @@ -11353,7 +11349,7 @@ If ALL is a number, fetch this number of articles." (if (and (numberp gnus-large-newsgroup) (> len gnus-large-newsgroup)) (let* ((cursor-in-echo-area nil) - (initial (gnus-parameter-large-newsgroup-initial + (initial (gnus-parameter-large-newsgroup-initial gnus-newsgroup-name)) (input (read-string -- 1.7.10.4