Sync.

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 7e55684..d57e805 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,10 @@
+2000-06-21  Simon Josefsson  <jas@pdc.kth.se>
+
+       * gnus.el (gnus-asynchronous): Removed (defined in gnus-async.el).
+
+       * nnimap.el (nnimap-callback): Update for IMAP4rev1 servers (see
+       patch commited 2000-04-02).
+
 2000-06-20  Simon Josefsson  <jas@pdc.kth.se>
 
        * imap.el (imap-mailbox-examine-1): New function.

diff --git a/lisp/gnus.el b/lisp/gnus.el
index 553db6d..04924d4 100644 (file)
--- a/lisp/gnus.el
+++ b/lisp/gnus.el
@@ -1122,11 +1122,6 @@ newsgroups."
   :group 'gnus-summary-marks
   :type 'character)
 
-(defcustom gnus-asynchronous nil
-  "*If non-nil, Gnus will supply backends with data needed for async article fetching."
-  :group 'gnus-asynchronous
-  :type 'boolean)
-
 (defcustom gnus-large-newsgroup 200
   "*The number of articles which indicates a large newsgroup.
 If the number of articles in a newsgroup is greater than this value,

diff --git a/lisp/nnimap.el b/lisp/nnimap.el
index 67c4f5a..0de70fa 100644 (file)
--- a/lisp/nnimap.el
+++ b/lisp/nnimap.el
@@ -612,7 +612,12 @@ function is generally only called when Gnus is shutting down."
   (with-current-buffer nnimap-callback-buffer
     (insert
      (with-current-buffer nnimap-server-buffer
-       (nnimap-demule (imap-message-get (imap-current-message) 'RFC822)))) ;xxx
+       (nnimap-demule
+        (if (imap-capability 'IMAP4rev1) 
+            ;; xxx don't just use car? alist doesn't contain
+            ;; anything else now, but it might...
+            (nth 2 (car (imap-message-get (imap-current-message) 'BODYDETAIL)))
+          (imap-message-get (imap-current-message) 'RFC822)))))
     (nnheader-ms-strip-cr)
     (funcall nnimap-callback-callback-function t)))