Synch with Oort Gnus.

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 7b5ca57..24f044f 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,12 @@
+2001-10-01  Simon Josefsson  <jas@extundo.com>
+
+       * mail-source.el (mail-source-fetch-imap): Use BODY.PEEK if server
+       is IMAP4rev1.
+
+       * nnml.el (gnus-article-unpropagatable-p): Autoload gnus-sum.
+
+       * nnfolder.el: Ditto.
+
 2001-09-30  Dan Christensen <jdc+news@uwo.ca>
 
        * gnus-sum.el (gnus-summary-extract-address-component): New function.

diff --git a/lisp/mail-source.el b/lisp/mail-source.el
index 136704c..0fb724c 100644 (file)
--- a/lisp/mail-source.el
+++ b/lisp/mail-source.el
@@ -913,7 +913,10 @@ This only works when `display-time' is enabled."
                  (push (cons from imap-password) mail-source-password-cache)))
              ;; if predicate is nil, use all uids
              (dolist (uid (imap-search (or predicate "1:*") buf))
-               (when (setq str (imap-fetch uid "RFC822.PEEK" 'RFC822 nil buf))
+               (when (setq str (if (imap-capability 'IMAP4rev1 buf)
+                                   (imap-fetch uid "BODY.PEEK[]" 'BODYDETAIL
+                                               nil buf)
+                           (imap-fetch uid "RFC822.PEEK" 'RFC822 nil buf)))
                  (push uid remove)
                  (insert "From imap " (current-time-string) "\n")
                  (save-excursion

diff --git a/lisp/nnfolder.el b/lisp/nnfolder.el
index b5abcda..ac604ea 100644 (file)
--- a/lisp/nnfolder.el
+++ b/lisp/nnfolder.el
@@ -42,6 +42,7 @@
 (require 'gnus-range)
 
 (eval-and-compile
+  (autoload 'gnus-article-unpropagatable-p "gnus-sum")
   (autoload 'gnus-intersection "gnus-range"))
 
 (nnoo-declare nnfolder)

diff --git a/lisp/nnml.el b/lisp/nnml.el
index f6e78e4..5cae12c 100644 (file)
--- a/lisp/nnml.el
+++ b/lisp/nnml.el
@@ -40,6 +40,9 @@
 (require 'nnmail)
 (require 'nnoo)
 
+(eval-and-compile
+  (autoload 'gnus-article-unpropagatable-p "gnus-sum"))
+
 (nnoo-declare nnml)
 
 (defvoo nnml-directory message-directory