2001-01-12 Yuuichi Teranishi <teranisi@gohome.org>

	* elmo-imap4.el (elmo-imap4-read-msg): Use "BODY[]" instead of
	"RFC822" (because RFC822.PEEK is obsolete).
	(Adviced by IMAI Takeshi <imai@on.rim.or.jp>)

2001-01-10  Katsumi Yamaoka    <yamaoka@jpl.org>

	* elmo-archive.el (elmo-archive-call-process): Don't check for
	the exit status when Nemacs is running.

	* wl-nemacs.el (elmo-archive-call-process): Moved to
	elmo-archive.el.

diff --git a/elmo/ChangeLog b/elmo/ChangeLog
index 70467b0..a2b4d45 100644 (file)
--- a/elmo/ChangeLog
+++ b/elmo/ChangeLog
@@ -1,3 +1,14 @@
+2001-01-12  Yuuichi Teranishi  <teranisi@gohome.org>
+
+       * elmo-imap4.el (elmo-imap4-read-msg): Use "BODY[]" instead of
+       "RFC822" (because RFC822.PEEK is obsolete).
+       (Adviced by IMAI Takeshi <imai@on.rim.or.jp>)
+
+2001-01-10  Katsumi Yamaoka    <yamaoka@jpl.org>
+
+       * elmo-archive.el (elmo-archive-call-process): Don't check for
+       the exit status when Nemacs is running.
+
 2001-01-09  Yuuichi Teranishi  <teranisi@gohome.org>
 
        * elmo-net.el (elmo-network-session-password-key): Don't set default to

diff --git a/elmo/elmo-archive.el b/elmo/elmo-archive.el
index 20345f0..d81e748 100644 (file)
--- a/elmo/elmo-archive.el
+++ b/elmo/elmo-archive.el
@@ -217,8 +217,12 @@
   (` (cdr (assq (, type)
                elmo-archive-file-regexp-alist))))
 
-(defsubst elmo-archive-call-process (prog args &optional output)
-  (= (apply 'call-process prog nil output nil args) 0))
+(if (boundp 'NEMACS)
+    (defsubst elmo-archive-call-process (prog args &optional output)
+      (apply 'call-process prog nil output nil args)
+      0)
+  (defsubst elmo-archive-call-process (prog args &optional output)
+    (= (apply 'call-process prog nil output nil args) 0)))
 
 (defsubst elmo-archive-call-method (method args &optional output)
   (cond

diff --git a/elmo/elmo-imap4.el b/elmo/elmo-imap4.el
index ba3c1af..adc7137 100644 (file)
--- a/elmo/elmo-imap4.el
+++ b/elmo/elmo-imap4.el
@@ -1371,15 +1371,14 @@ If optional argument UNMARK is non-nil, unmark."
          (elmo-imap4-send-command-wait session
                                        (format
                                         (if elmo-imap4-use-uid
-                                            "uid fetch %s rfc822%s"
-                                          "fetch %s rfc822%s")
+                                            "uid fetch %s body%s[]"
+                                          "fetch %s body%s[]")
                                         msg
                                         (if leave-seen-flag-untouched
                                             ".peek" ""))))
-    (and (setq response (elmo-imap4-response-value
+    (and (setq response (elmo-imap4-response-bodydetail-text
                         (elmo-imap4-response-value-all
-                         response 'fetch )
-                        'rfc822))
+                         response 'fetch )))
         (with-current-buffer outbuf
           (erase-buffer)
           (insert response)

diff --git a/wl/ChangeLog b/wl/ChangeLog
index d08f1c0..5d0c5d1 100644 (file)
--- a/wl/ChangeLog
+++ b/wl/ChangeLog
@@ -1,3 +1,8 @@
+2001-01-10  Katsumi Yamaoka    <yamaoka@jpl.org>
+
+       * wl-nemacs.el (elmo-archive-call-process): Moved to
+       elmo-archive.el.
+
 2001-01-02  TAKAHASHI Kaoru  <kaoru@kaisei.org>
 
        * wl-draft.el (wl-draft-reply-list-symbol): New function.

diff --git a/wl/wl-nemacs.el b/wl/wl-nemacs.el
index aedf791..7087f33 100644 (file)
--- a/wl/wl-nemacs.el
+++ b/wl/wl-nemacs.el
@@ -53,10 +53,6 @@
 (defmacro wl-defface (face spec doc &rest args)
   (` (defvar (, face) (, spec) (, doc))))
 
-(defsubst elmo-archive-call-process (prog args &optional output)
-  (apply 'call-process prog nil output nil args)
-  0)
-
 (defun wl-draft-mode-setup ()
   (defalias 'wl-draft-mode 'mail-mode))
 (defun wl-draft-key-setup ())