From c93215d01e5d2944739b01d1414f785b1bffa54a Mon Sep 17 00:00:00 2001 From: yamaoka Date: Sun, 20 Apr 2003 22:02:40 +0000 Subject: [PATCH] Synch to Oort Gnus 200304201425. --- lisp/ChangeLog | 7 +++++++ lisp/mml1991.el | 2 +- lisp/nndb.el | 2 +- lisp/nnimap.el | 14 +++++++++----- 4 files changed, 18 insertions(+), 7 deletions(-) diff --git a/lisp/ChangeLog b/lisp/ChangeLog index 489bcd5..3ae8d1f 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog @@ -1,5 +1,12 @@ +2003-04-20 Jesper Harder + + * nndb.el, mml1991.el: Fix license template. + 2003-04-20 Simon Josefsson + * nnimap.el (nnimap-split-articles): Don't download body unless + required. + * imap.el (imap-gssapi-open, imap-ssl-open): Erase buffer before starting process, like imap-kerberos4-open does. diff --git a/lisp/mml1991.el b/lisp/mml1991.el index ec4245c..741cfe2 100644 --- a/lisp/mml1991.el +++ b/lisp/mml1991.el @@ -5,7 +5,7 @@ ;; Simon Josefsson (Mailcrypt interface, Gnus glue) ;; Keywords PGP -;; This file is (not yet) part of GNU Emacs. +;; This file is part of GNU Emacs. ;; GNU Emacs is free software; you can redistribute it and/or modify ;; it under the terms of the GNU General Public License as published by diff --git a/lisp/nndb.el b/lisp/nndb.el index cfcc0c6..986f84c 100644 --- a/lisp/nndb.el +++ b/lisp/nndb.el @@ -8,7 +8,7 @@ ;; David Blacka ;; Keywords: news -;; This file is NOT part of GNU Emacs. +;; This file is part of GNU Emacs. ;; GNU Emacs is free software; you can redistribute it and/or modify ;; it under the terms of the GNU General Public License as published by diff --git a/lisp/nnimap.el b/lisp/nnimap.el index 8415705..306f54e 100644 --- a/lisp/nnimap.el +++ b/lisp/nnimap.el @@ -1268,7 +1268,9 @@ function is generally only called when Gnus is shutting down." (when (setq rule (nnimap-split-find-rule server inbox)) ;; iterate over articles (dolist (article (imap-search nnimap-split-predicate)) - (when (if nnimap-split-download-body + (when (if (if (eq nnimap-split-download-body 'default) + nnimap-split-download-body-default + nnimap-split-download-body) (and (nnimap-request-article article) (mail-narrow-to-head)) (nnimap-request-head article)) @@ -1286,16 +1288,18 @@ function is generally only called when Gnus is shutting down." (setq removeorig t) (when nnmail-cache-accepted-message-ids (with-current-buffer nntp-server-buffer - (let (msgid) - (and (setq msgid + (let (msgid) + (and (setq msgid (nnmail-fetch-field "message-id")) - (nnmail-cache-insert msgid to-group))))) + (nnmail-cache-insert msgid to-group))))) ;; Add the group-art list to the history list. (push (list (cons to-group 0)) nnmail-split-history)) (t (message "IMAP split failed to move %s:%s:%d to %s" server inbox article to-group)))) - (if nnimap-split-download-body + (if (if (eq nnimap-split-download-body 'default) + nnimap-split-download-body-default + nnimap-split-download-body) (widen)) ;; remove article if it was successfully copied somewhere (and removeorig -- 1.7.10.4