* gnus.el: Semi-gnus 6.10.10 is released.

[elisp/gnus.git-] / lisp / pop3-fma.el

diff --git a/lisp/pop3-fma.el b/lisp/pop3-fma.el
index 90db4d2..d6ecf68 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)))
@@ -199,13 +195,17 @@ If there is any problem , please set this variable to nil(default).
   "Function to move mail from INBOX on a pop3 server to file CRASHBOX."
   (if (string-match "^po:" inbox)
       (progn
+       (if (and pop3-fma-save-password-information
+                (not pop3-fma-password))
+           (pop3-fma-set-pop3-password))
        (let ((pop3-maildrop
               (substring inbox (match-end (string-match "^po:" inbox))
                          (- (match-end (string-match "^.*@" inbox)) 1)))
              (pop3-mailhost
               (substring inbox (match-end (string-match "^.*@" inbox))))
              (pop3-password
-              (if pop3-fma-save-password-information
+              (if (and pop3-fma-save-password-information
+                       pop3-fma-password)
                   (pop3-fma-read-passwd (substring inbox (match-end (string-match "^.*@" inbox))))
                 (pop3-fma-input-password
                  (substring inbox (match-end (string-match "^.*@" inbox)))
@@ -217,8 +217,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))