* (dgnushack-make-package): Fix typo.

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

diff --git a/lisp/gnus-ofsetup.el b/lisp/gnus-ofsetup.el
index d70d119..a3e8be1 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.2.11 1999-02-03 02:06:20 ichikawa Exp $
+;;; $Id: gnus-ofsetup.el,v 1.1.2.15 1999-02-15 06:24:21 ichikawa Exp $
 ;;;
 ;;; Copyright (C) 1998 Tatsuya Ichikawa
 ;;; Author: Tatsuya Ichikawa <t-ichi@po.shiojiri.ne.jp>
@@ -220,32 +220,39 @@
                          '(("pop" 1) ("apop" 2)) nil t nil))
                    (islisp (y-or-n-p "Do you use pop3.el to fetch mail? ")))
                (if (not islisp)
-                   (let ((prog (read-file-name "movemail program name: "))
-                         (args (read-from-minibuffer "movemail options: ")))
+                   (let ((prog (read-file-name "movemail program name: "
+                                               exec-directory "movemail"))
+                         (args (read-from-minibuffer "movemail options: " "-pf")))
                      (setq mail-source
                            (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)))
 
@@ -333,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")
@@ -341,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 '")