Sync up with gnus-5.6.38 and Enable to get APOP server using pop3-fma.el and gnus...

[elisp/gnus.git-] / lisp / gnus-offline.el

diff --git a/lisp/gnus-offline.el b/lisp/gnus-offline.el
index 8c5cb42..bf4642f 100644 (file)
--- a/lisp/gnus-offline.el
+++ b/lisp/gnus-offline.el
@@ -6,7 +6,7 @@
 ;;;         Yukihiro Ito <ito@rs.civil.tohoku.ac.jp>
 ;;;         Hidekazu Nakamura <u90121@uis-inf.co.jp>
 
-;;; Version: 1.52
+;;; Version: 1.51
 ;;; Keywords: news , mail , offline , gnus
 ;;;
 ;;; SPECIAL THANKS
@@ -114,7 +114,7 @@
   :group 'mail
   :group 'news)
 
-(defconst gnus-offline-version-number "1.52")
+(defconst gnus-offline-version-number "1.51")
 (defconst gnus-offline-codename
 ;;  "You may be right"         ; 1.40
 ;;  "Chilstie Lee"             ; 1.45
@@ -122,8 +122,8 @@
 ;;  "Easy money"               ; 1.47
 ;;  "An Innocent man"          ; 1.48
 ;;  "Tell her about it"                ; 1.50
-;;  "This night"               ; 1.51
-  "Movin'out"                  ; 1.52
+  "This night"                 ; 1.51
+;;  "Movin'out"
 ;;  "Longest night"
 ;;  "Leave a tender moment alone"
 ;;  "Back in the U.S.S.R"
@@ -222,7 +222,7 @@ smtp means use smtp.el.
   :type '(choice (const smtp)
                 (const sendmail)))
 
-(defcustom gnus-offline-drafts-queue-type 'agent
+(defcustom gnus-offline-drafts-queue-type 'miee
   "*Type of to queue drafts method.
 'miee means drafts are queued and sent by miee.el.
 'agent means drafts are queued and sent by gnus-agent.el"
@@ -326,14 +326,8 @@ If value is nil , dialup line is disconnected status.")
   
   ;; Spool directory setting - Miee
   (if (eq gnus-offline-drafts-queue-type 'miee)
-      (progn
-       (if (not (file-exists-p gnus-offline-mail-spool-directory))
-           (make-directory gnus-offline-mail-spool-directory t))
-       (setq sendmail-to-spool-directory gnus-offline-news-spool-directory)
-       (if (not (file-exists-p gnus-offline-news-spool-directory))
-           (make-directory gnus-offline-news-spool-directory t))
-       (setq sendmail-to-spool-directory gnus-offline-mail-spool-directory
-             news-spool-request-post-directory gnus-offline-news-spool-directory)))
+      (setq sendmail-to-spool-directory gnus-offline-mail-spool-directory
+           news-spool-request-post-directory gnus-offline-news-spool-directory))
   
   ;; When startup ... state is offline.
   (setq gnus-nntp-service nil
@@ -544,7 +538,12 @@ If value is nil , dialup line is disconnected status.")
       (progn
        (setq gnus-offline-mail-fetch-method 'nnmail)
        (setq nnmail-movemail-program 'pop3-fma-movemail)
-       (setq nnmail-spool-file pop3-fma-spool-file-alist))))
+       (setq nnmail-spool-file (append
+                                pop3-fma-local-spool-file-alist
+                                (mapcar
+                                 (lambda (spool)
+                                   (car spool))
+                                 pop3-fma-spool-file-alist))))))
 ;;
 ;; Enable fetch news
 ;;