(gnus-setup-for-offline): Accept an optional argument `force'. Use

`read-file-name' instead of `read-directory-name'.

diff --git a/lisp/gnus-ofsetup.el b/lisp/gnus-ofsetup.el
index ca34afa..c69a5f4 100644 (file)
--- a/lisp/gnus-ofsetup.el
+++ b/lisp/gnus-ofsetup.el
@@ -187,7 +187,6 @@
     (setup-20 . "File: ")
     (setup-21 . "Directory: ")
     (setup-22 . "What network stream? ")
-    (setup-23 . "What authentication? ")
 
     (param-news-method-1 . "News Method")
     (param-news-method-2 . "Gnus Agent")
@@ -286,7 +285,7 @@ restarted.")
     (setup-11 . "\e$B@_Dj$9$k%a!<%k<hF@@h$N?t$O\e(B? (\e$B8e$GDI2C$G$-$^$9\e(B): ")
     (setup-12 . "\e$B%a!<%k$N%"%+%&%s%HL>\e(B: ")
     (setup-13 . "\e$B$=$N%"%+%&%s%H$N$"$k%a!<%k%5!<%PL>\e(B: ")
-    (setup-14 . "\e$B$=$N%5!<%P$G$NG'>ZJ}<0$O\e(B? ")
+    (setup-14 . "\e$BG'>ZJ}<0$O\e(B? ")
     (setup-15 . "\e$B%a!<%k$N<u?.$K$O\e(B pop3.el \e$B$r;H$$$^$9$+\e(B? ")
     (setup-16 . "movemail \e$B%W%m%0%i%`$NL>A0\e(B: ")
     (setup-17 . "movemail \e$B%W%m%0%i%`$KEO$90z?t\e(B: ")
@@ -295,7 +294,6 @@ restarted.")
     (setup-20 . "\e$B%U%!%$%k\e(B: ")
     (setup-21 . "\e$B%G%#%l%/%H%j\e(B: ")
     (setup-22 . "\e$B@\B3J}<0$O\e(B? ")
-    (setup-23 . "\e$BG'>ZJ}<0$O\e(B? ")
 
     (param-news-method-4 . "\
 \e$B%K%e!<%95-;v$r<hF@$9$kJ}K!$G$9!#\e(B")
@@ -404,10 +402,10 @@ mail source specifier \e$B$H$+>e5-$N$h$&$J%-!<%o!<%I$K$D$$$F$b$C$H$h$/\e(B
                     syms)
                    nil t nil)))
 
-(defun gnus-setup-for-offline ()
+(defun gnus-setup-for-offline (&optional force)
   "*Set up Gnus for offline environment."
-  (interactive)
-  (unless (file-exists-p gnus-offline-setting-file)
+  (interactive "P")
+  (unless (and (file-exists-p gnus-offline-setting-file) (not force))
     (let (news-method
          mail-method agent-directory drafts-queue-type news-spool mail-spool
          use-miee MTA-type dialup-program dialup-program-arguments
@@ -512,14 +510,14 @@ mail source specifier \e$B$H$+>e5-$N$h$&$J%-!<%o!<%I$K$D$$$F$b$C$H$h$/\e(B
                          'kerberos4 'ssl 'network))
            (setq authentication (gnus-ofsetup-completing-read-symbol
                                  (format "<%d of %d> %s" j n
-                                         (gnus-ofsetup-gettext 'setup-23))
+                                         (gnus-ofsetup-gettext 'setup-14))
                                  'kerberos4 'cram-md5 'anonymous 'login)))
          (when (string= type "file")
            (setq path (read-file-name
                        (format "<%d of %d> %s" j n
                                (gnus-ofsetup-gettext 'setup-20)))))
          (when (or (string= type "directory") (string= type "maildir"))
-           (setq path (read-directory-name
+           (setq path (read-file-name
                        (format "<%d of %d> %s" j n
                                (gnus-ofsetup-gettext 'setup-21)))))
          ;; Now set a mail source specifier.
@@ -531,7 +529,7 @@ mail source specifier \e$B$H$+>e5-$N$h$&$J%-!<%o!<%I$K$D$$$F$b$C$H$h$/\e(B
                       (nconc source
                              (list
                               (make-symbol
-                               (format ":%s" (prin1-to-string sym)))
+                               (format ":%s" sym))
                               (symbol-value sym))))))
           '(path user server authentication stream program))
          (setq mail-source (nconc mail-source (list source))))