From 5fda0c950ab60657838a899f26c1744a513c5f68 Mon Sep 17 00:00:00 2001 From: yamaoka Date: Tue, 2 Oct 2001 22:32:45 +0000 Subject: [PATCH] Synch with Oort Gnus. --- lisp/ChangeLog | 11 +++++++++++ lisp/gnus-agent.el | 4 +++- lisp/nnimap.el | 4 +++- 3 files changed, 17 insertions(+), 2 deletions(-) diff --git a/lisp/ChangeLog b/lisp/ChangeLog index 24f044f..7deed3a 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog @@ -1,3 +1,14 @@ +2001-10-02 Simon Josefsson + + * nnimap.el (nnimap-request-move-article): Use imap.el directly, + don't go through `nnimap-request-expire-articles' to delete the + article. Thanks to prj@po.cwru.edu (Paul Jarc). + +2001-10-02 10:00:00 ShengHuo ZHU + + * gnus-agent.el (gnus-agent-write-active): The min in the + agent/active may be larger than that in the server/active. + 2001-10-01 Simon Josefsson * mail-source.el (mail-source-fetch-imap): Use BODY.PEEK if server diff --git a/lisp/gnus-agent.el b/lisp/gnus-agent.el index fa97cce..46e2a42 100644 --- a/lisp/gnus-agent.el +++ b/lisp/gnus-agent.el @@ -754,7 +754,9 @@ the actual number of articles toggled is returned." (when (and sym (boundp sym)) (if (and (boundp (setq osym (intern (symbol-name sym) orig))) (setq elem (symbol-value osym))) - (setcdr elem (cdr (symbol-value sym))) + (if (> (car elem) (car (symbol-value sym))) + (setcar elem (car (symbol-value sym))) + (setcdr elem (cdr (symbol-value sym)))) (set (intern (symbol-name sym) orig) (symbol-value sym))))) new)) (gnus-make-directory (file-name-directory file)) diff --git a/lisp/nnimap.el b/lisp/nnimap.el index 2f4f7ea..b1d9167 100644 --- a/lisp/nnimap.el +++ b/lisp/nnimap.el @@ -1210,7 +1210,9 @@ function is generally only called when Gnus is shutting down." (setq result (eval accept-form)) (kill-buffer buf) result) - (nnimap-request-expire-articles (list article) group server t)) + (imap-message-flags-add + (imap-range-to-message-set (list article)) + "\\Deleted" 'silent nnimap-server-buffer)) result)))) (deffoo nnimap-request-accept-article (group &optional server last) -- 1.7.10.4