1999-02-15 Tatsuya Ichikawa <t-ichi@po.shiojiri.ne.jp>

	* lisp/gnus-ofsetup.el (gnus-setup-for-offline): Bug fix when
	using nnspool.

	* lisp/pop3-fma.el (pop3-fma-movemail): Delete meadow specific
	code.

diff --git a/ChangeLog b/ChangeLog
index 6f22b16..cea7273 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,11 @@
+1999-02-15  Tatsuya Ichikawa  <t-ichi@po.shiojiri.ne.jp>
+
+       * lisp/gnus-ofsetup.el (gnus-setup-for-offline): Bug fix when
+       using nnspool.
+
+       * lisp/pop3-fma.el (pop3-fma-movemail): Delete meadow specific
+       code.
+
 1999-02-12  Katsumi Yamaoka   <yamaoka@jpl.org>
 
        * lisp/gnus-art.el (article-hide-headers): Show all headers when

diff --git a/lisp/gnus-ofsetup.el b/lisp/gnus-ofsetup.el
index 73bb60f..5f5cf25 100644 (file)
--- a/lisp/gnus-ofsetup.el
+++ b/lisp/gnus-ofsetup.el
@@ -1,6 +1,6 @@
 ;;; gnus-ofsetup.el --- Setup advisor for Offline reading for Mail/News.
 ;;;
-;;; $Id: gnus-ofsetup.el,v 1.1.4.4 1999-02-03 22:11:10 yamaoka Exp $
+;;; $Id: gnus-ofsetup.el,v 1.1.4.5 1999-02-15 06:31:58 ichikawa Exp $
 ;;;
 ;;; Copyright (C) 1998 Tatsuya Ichikawa
 ;;; Author: Tatsuya Ichikawa <t-ichi@po.shiojiri.ne.jp>
@@ -227,26 +227,32 @@
                            (append mail-source
                                    (list
                                     (list
-                                     auth
+                                     'pop
                                      :user user
                                      :server server
-                                     :program prog
-                                     :args (format "%s %s" args
-                                                   (concat "po:" user)))))))
+                                     :program
+                                     (format "%s %s %s %s %s"
+                                             prog
+                                             args
+                                             "po:%u"
+                                             "%t"
+                                             "%p")
+                                             :authentication auth)))))
                  (setq mail-source
                        (append mail-source
                                (list
                                 (list
-                                 auth
+                                 'pop
                                  :user user
-                                 :server server))))))
+                                 :server server
+                                 :authentication auth))))))
              (setq i (- i 1)))
            ;; Replace "hoge" -> 'hoge
            (mapcar
             (lambda (x)
-              (if (string-equal (nth 0 x) "pop")
-                  (setcar x 'pop)
-                (setcar x 'apop)))
+              (if (string-equal (car (last x)) "pop")
+                  (setcar (last x) (quote 'pop))
+                (setcar (last x) (quote 'apop))))
             mail-source)
            (setq gnus-offline-mail-source mail-source)))
 
@@ -334,7 +340,9 @@
        (insert "(add-hook 'gnus-after-getting-new-news-hook 'gnus-offline-after-get-new-news)\n")
        (insert "(add-hook 'gnus-after-getting-news-hook 'gnus-offline-after-get-new-news)\n")
        (if (eq gnus-offline-news-fetch-method 'nnspool)
-           (insert "(add-hook 'after-getting-news-hook 'gnus-offline-nnspool-hangup-line)\n"))
+           (progn
+             (insert "(add-hook 'after-getting-news-hook 'gnus-offline-nnspool-hangup-line)\n")
+             (insert "(add-hook 'gnus-before-startup-hook (lambda () (setq nnmail-spool-file nil)))\n")))
        (insert "(add-hook 'message-send-hook 'gnus-offline-message-add-header)\n")
        (insert "(autoload 'gnus-offline-setup \"gnus-offline\")\n")
        (insert "(add-hook 'gnus-load-hook 'gnus-offline-setup)\n")
@@ -342,7 +350,6 @@
        (if (not (locate-library "mail-source"))
            (progn
              ;; Write setting about pop3-fma.
-             (insert "(setq nnmail-spool-file nil)\n")
              (insert "(require 'pop3-fma)\n")
              (insert "(add-hook 'message-send-hook 'pop3-fma-message-add-header)\n")
              (insert "(setq pop3-fma-spool-file-alist '")

diff --git a/lisp/pop3-fma.el b/lisp/pop3-fma.el
index 90db4d2..65a250a 100644 (file)
--- a/lisp/pop3-fma.el
+++ b/lisp/pop3-fma.el
@@ -50,9 +50,6 @@
 ;;     pass means normal authentication USER/PASS.
 ;;     apop means authentication using APOP.
 ;;
-;; When using apop , Please set pop3-fma-movemail-type 'lisp.
-;; movemail.exe does not work on APOP protocol.
-;;
 ;; Variables
 ;;
 ;;  pop3-fma-spool-file-alist      ... Spool file alist of POP3 protocol
@@ -118,8 +115,7 @@ Type must be pass or apop."
 (defcustom pop3-fma-movemail-type 'lisp
   "*Type of movemail program.
 Lisp means `nnmail-movemail-program' is lisp function.
- Exe means `nnmail-movemail-program' is external program.
- Please do not use exe if you do not use Meadow."
+ Exe means `nnmail-movemail-program' is external program."
   :group 'pop3-fma
   :type '(choice (const lisp)
                 (const exe)))
@@ -217,8 +213,7 @@ If there is any problem , please set this variable to nil(default).
          (if (eq pop3-authentication-scheme 'pass)
              (message "Checking new mail user %s at %s using USER/PASS ..." pop3-maildrop pop3-mailhost)
            (message "Checking new mail user %s at %s using APOP ..." pop3-maildrop pop3-mailhost))
-         (if (and (eq system-type 'windows-nt)
-                  (eq pop3-fma-movemail-type 'exe))
+         (if (eq pop3-fma-movemail-type 'exe)
              (progn
                (setenv "MAILHOST" pop3-mailhost)
                (if (and (not (memq pop3-password pop3-fma-commandline-arguments))