From: czkmt <czkmt>
Date: Tue, 20 Jul 1999 14:53:50 +0000 (+0000)
Subject: * lisp/gnus.el (gnus-revision-number): Increment to 01.
X-Git-Tag: t-gnus-6_10_072-01
X-Git-Url: http://git.chise.org/gitweb/?a=commitdiff_plain;h=505a1c2ee29dfbeaa008c4cd257c60103b07cade;p=elisp%2Fgnus.git-

* lisp/gnus.el (gnus-revision-number): Increment to 01.
* lisp/gnus-ofsetup.el (gnus-ofsetup-prepare-for-miee,
gnus-ofsetup-write-setting-file): New functions.
(gnus-setup-for-offline): Use them.
(gnus-ofsetup-parameters, gnus-ofsetup-customize,
gnus-ofsetup-customize-done): New functions for customization support.
* lisp/gnus-offline.el (gnus-offline-version-number): Update to 2.20.
(gnus-offline-define-menu-on-miee,
gnus-offline-define-menu-on-agent): Add a menu item which calls
`gnus-ofsetup-customize'.
---

diff --git a/ChangeLog b/ChangeLog
index cc7b61b..1c92a7d 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,20 @@
+1999-07-20   Tsukamoto Tetsuo  <czkmt@remus.dti.ne.jp>
+
+	* lisp/gnus.el (gnus-revision-number): Increment to 01.
+
+	* lisp/gnus-ofsetup.el (gnus-ofsetup-prepare-for-miee,
+	gnus-ofsetup-write-setting-file): New functions.
+	(gnus-setup-for-offline): Use them.
+	(gnus-ofsetup-parameters, gnus-ofsetup-customize,
+	gnus-ofsetup-customize-done): New functions for customization
+	support.
+
+	* lisp/gnus-offline.el (gnus-offline-version-number): Update to
+	2.20.
+	(gnus-offline-define-menu-on-miee,
+	gnus-offline-define-menu-on-agent): Add a menu item which calls
+	`gnus-ofsetup-customize'.
+
 1999-07-11  Katsumi Yamaoka   <yamaoka@jpl.org>
 
 	* lisp/gnus.el (gnus-version-number): Update to 6.10.072.
diff --git a/lisp/gnus-offline.el b/lisp/gnus-offline.el
index 03126a5..b5786b4 100644
--- a/lisp/gnus-offline.el
+++ b/lisp/gnus-offline.el
@@ -1,5 +1,5 @@
 ;;; gnus-offline.el --- To process mail & news at offline environment.
-;;; $Id: gnus-offline.el,v 1.1.2.5.2.35 1999-03-22 21:46:30 czkmt Exp $
+;;; $Id: gnus-offline.el,v 1.1.2.5.2.36 1999-07-20 14:53:45 czkmt Exp $
 
 ;;; Copyright (C) 1998 Tatsuya Ichikawa
 ;;;                    Yukihiro Ito
@@ -100,13 +100,14 @@
   :group 'mail
   :group 'news)
 
-(defconst gnus-offline-version-number "2.10b1")
+(defconst gnus-offline-version-number "2.20")
 (defconst gnus-offline-codename
 ;;  "Beta5"			; Beta
 ;;  "This is the time"		; 2.00
 ;;  "A matter of trust"
 ;;  "Modern Woman"
-  "Ahhhhhhh!!"			; 2.10b1
+;;  "Ahhhhhhh!!"		; 2.10b1
+  "Cup of life"                 ; 2.20
 ;;  "Code of silence"
   )
 
@@ -795,7 +796,9 @@ If value is nil , dialup line is disconnected status.")
 	  ["取得済記事を消す" gnus-offline-agent-expire (eq gnus-offline-news-fetch-method 'nnagent)]
 	  ["記事取得間隔時間の設定" gnus-offline-set-interval-time t]
 	  "----"
-	  ["回線の切断" gnus-offline-set-unplugged-state gnus-offline-connected])
+	  ["回線の切断" gnus-offline-set-unplugged-state gnus-offline-connected]
+	  "----"
+	  ["プロパティ..." gnus-ofsetup-customize t])
 	 ))
     (easy-menu-change
      nil
@@ -818,6 +821,8 @@ If value is nil , dialup line is disconnected status.")
 	["Set interval time" gnus-offline-set-interval-time t]
 	"----"
 	["Hang up Line." gnus-offline-set-unplugged-state gnus-offline-connected]
+	"----"
+	["Customize options..." gnus-ofsetup-customize t]
 	))))))
   (and (featurep 'xemacs)
        (easy-menu-add menu))))
@@ -841,7 +846,9 @@ If value is nil , dialup line is disconnected status.")
 	 ["取得済記事を消す" gnus-offline-agent-expire (eq gnus-offline-news-fetch-method 'nnagent)]
 	 ["記事取得間隔時間の設定" gnus-offline-set-interval-time t]
 	 "----"
-	 ["回線の切断" gnus-offline-set-unplugged-state gnus-offline-connected])
+	 ["回線の切断" gnus-offline-set-unplugged-state gnus-offline-connected]
+	 "----"
+	 ["プロパティ..." gnus-ofsetup-customize t])
      '("Offline"
        ["Toggle movemail program" gnus-offline-toggle-movemail-program
 	(not (featurep 'running-pterodactyl-gnus-0_73-or-later))]
@@ -852,7 +859,9 @@ If value is nil , dialup line is disconnected status.")
        ["Expire articles" gnus-offline-agent-expire (eq gnus-offline-news-fetch-method 'nnagent)]
        ["Set interval time" gnus-offline-set-interval-time t]
        "----"
-       ["Hang up Line." gnus-offline-set-unplugged-state gnus-offline-connected])))
+       ["Hang up Line." gnus-offline-set-unplugged-state gnus-offline-connected]
+       "----"
+       ["Customize options..." gnus-ofsetup-customize t])))
   (and (featurep 'xemacs)
        (easy-menu-add gnus-offline-menu-on-agent)))
 ;;
diff --git a/lisp/gnus-ofsetup.el b/lisp/gnus-ofsetup.el
index 48fe899..833eff0 100644
--- 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.18 1999-05-13 02:36:22 yamaoka Exp $
+;;; $Id: gnus-ofsetup.el,v 1.1.2.19 1999-07-20 14:53:48 czkmt Exp $
 ;;;
 ;;; Copyright (C) 1998 Tatsuya Ichikawa
 ;;; Author: Tatsuya Ichikawa <t-ichi@po.shiojiri.ne.jp>
@@ -37,6 +37,8 @@
 (defvar gnus-offline-mail-fetch-method nil)
 (defvar gnus-offline-hangup-program nil)
 (defvar gnus-offline-dialup-program nil)
+(defvar gnus-offline-mail-spool-directory nil)
+(defvar gnus-offline-news-spool-directory nil)
 (defvar pop3-fma-spool-file-alist nil)
 (defvar pop3-fma-movemail-type nil)
 (defvar pop3-fma-movemail-arguments nil)
@@ -142,19 +144,7 @@
 		  (setq gnus-offline-news-spool-directory news-spool)
 		  (setq gnus-offline-drafts-queue-type 'miee)
 		  
-		  ;; Load MIEE.
-		  (load "miee")
-		  ;; Set news post function for MIEE.
-		  (setq message-send-news-function 'gnspool-request-post)
-		  ;; Spool directory setting - MIEE.
-		  (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-mail-spool-directory)
-		  (if (not (file-exists-p gnus-offline-news-spool-directory))
-		      (make-directory gnus-offline-news-spool-directory t))
-		  (setq news-spool-request-post-directory
-			gnus-offline-news-spool-directory)))
+		  (gnus-ofsetup-prepare-for-miee)))
 	    
 	    ;; Set drafts type gnus-agent.
 	    (setq gnus-offline-drafts-queue-type 'agent))
@@ -250,125 +240,344 @@
 	(setq save-passwd
 	      (y-or-n-p "Do you save password information to newsrc file? "))
 	
-	;; Write to setting file.
-	(setq tmp-buffer (get-buffer-create "* Setting"))
-	(set-buffer "* Setting")
-	(erase-buffer)
-	(insert ";;\n");
-	(insert ";; This file is created by gnus-ofsetup.el\n")
-	(insert ";; Creation date : ")
-	(insert (current-time-string))
-	(insert "\n")
-	(insert ";;\n")
-
-	;; write Basic setting
-	(insert "(setq gnus-offline-news-fetch-method '")
-	(insert (prin1-to-string gnus-offline-news-fetch-method))
-	(insert ")\n")
-	(insert "(setq gnus-offline-mail-fetch-method '")
-	(insert (prin1-to-string gnus-offline-mail-fetch-method))
+	(gnus-ofsetup-write-setting-file)))
+  (load gnus-offline-setting-file))
+
+(defun gnus-ofsetup-prepare-for-miee ()
+  ;; Load MIEE.
+  (if (not (boundp 'miee-version))
+      (load "miee"))
+  ;; Set news post function for MIEE.
+  (setq message-send-news-function 'gnspool-request-post)
+  ;; Spool directory setting - MIEE.
+  (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-mail-spool-directory)
+  (if (not (file-exists-p gnus-offline-news-spool-directory))
+      (make-directory gnus-offline-news-spool-directory t))
+  (setq news-spool-request-post-directory
+	gnus-offline-news-spool-directory))
+
+(defun gnus-ofsetup-write-setting-file ()
+  ;; Write to setting file.
+  (setq tmp-buffer (get-buffer-create "* Setting"))
+  (set-buffer "* Setting")
+  (erase-buffer)
+  (insert ";;\n");
+  (insert ";; This file is created by gnus-ofsetup.el\n")
+  (insert ";; Creation date : ")
+  (insert (current-time-string))
+  (insert "\n")
+  (insert ";;\n")
+  
+  ;; write Basic setting
+  (insert "(setq gnus-offline-news-fetch-method '")
+  (insert (prin1-to-string gnus-offline-news-fetch-method))
+  (insert ")\n")
+  (insert "(setq gnus-offline-mail-fetch-method '")
+  (insert (prin1-to-string gnus-offline-mail-fetch-method))
+  (insert ")\n")
+  (insert "(setq gnus-offline-use-miee ")
+  (insert (prin1-to-string gnus-offline-use-miee))
+  (insert ")\n")
+  (insert "(setq gnus-offline-dialup-program ")
+  (insert (prin1-to-string gnus-offline-dialup-program))
+  (insert ")\n")
+  
+  ;; write dialup/hangup program and options.
+  (if (stringp gnus-offline-dialup-program)
+      (progn
+	(insert "(setq gnus-offline-dialup-program-arguments '")
+	(insert (prin1-to-string gnus-offline-dialup-program-arguments))
+	(insert ")\n")))
+  (insert "(setq gnus-offline-hangup-program ")
+  (insert (prin1-to-string gnus-offline-hangup-program))
+  (insert ")\n")
+  (if (stringp gnus-offline-hangup-program)
+      (progn
+	(insert "(setq gnus-offline-hangup-program-arguments '")
+	(insert (prin1-to-string gnus-offline-hangup-program-arguments))
+	(insert ")\n")))
+
+  (if (boundp 'gnus-offline-interval-time)
+      (progn
+	(insert "(setq gnus-offline-interval-time ")
+	(insert (prin1-to-string gnus-offline-interval-time))
+	(insert ")\n")))
+
+  ;; write setting about MIEE.
+  (if gnus-offline-use-miee
+      (progn
+	(insert "(setq gnus-offline-mail-spool-directory ")
+	(insert (prin1-to-string gnus-offline-mail-spool-directory))
 	(insert ")\n")
-	(insert "(setq gnus-offline-use-miee ")
-	(insert (prin1-to-string gnus-offline-use-miee))
+	(insert "(setq gnus-offline-news-spool-directory ")
+	(insert (prin1-to-string gnus-offline-news-spool-directory))
 	(insert ")\n")
-	(insert "(setq gnus-offline-dialup-program ")
-	(insert (prin1-to-string gnus-offline-dialup-program))
+	(insert "(setq sendmail-to-spool-directory gnus-offline-mail-spool-directory)\n")
+	(insert "(setq news-spool-request-post-directory gnus-offline-news-spool-directory)\n")
+	(insert "(load \"miee\")\n")
+	(insert "(setq message-send-news-function '")
+	(insert (prin1-to-string message-send-news-function))
+	(insert ")\n")))
+  
+  ;; write setting about nnspool and gnus-agent.
+  (if (equal gnus-offline-news-fetch-method 'nnspool)
+      (insert "(message-offline-state)\n")
+    (insert "(setq gnus-agent-directory ")
+    (insert (prin1-to-string gnus-agent-directory))
+    (insert ")\n"))
+  
+  ;; write setting about queue type -- MIEE or nnagent.
+  (insert "(setq gnus-offline-drafts-queue-type '")
+  (insert (prin1-to-string gnus-offline-drafts-queue-type))
+  (insert ")\n")
+  (insert "(setq gnus-offline-MTA-type '")
+  (insert (prin1-to-string gnus-offline-MTA-type))
+  (insert ")\n")
+  
+  ;; Offline setting for gnus-nntp-*
+  (insert "(setq gnus-nntp-service nil)\n")
+  (insert "(setq gnus-nntp-server nil)\n")
+  
+  ;; Write setting about hooks.
+  (insert "(add-hook 'gnus-group-mode-hook 'gnus-offline-processed-by-timer t)\n")
+  (insert "(add-hook 'gnus-group-mode-hook 'gnus-offline-error-check t)\n")
+  (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)
+      (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")
+  
+  (if (not (locate-library "mail-source"))
+      (progn
+	;; Write setting about pop3-fma.
+	(insert "(require 'pop3-fma)\n")
+	(insert "(add-hook 'message-send-hook 'pop3-fma-message-add-header)\n")
+	(insert "(setq pop3-fma-spool-file-alist '")
+	(insert (prin1-to-string pop3-fma-spool-file-alist))
 	(insert ")\n")
-
-	;; write dialup/hangup program and options.
-	(if (stringp gnus-offline-dialup-program)
-	    (progn
-	      (insert "(setq gnus-offline-dialup-program-arguments '")
-	      (insert (prin1-to-string gnus-offline-dialup-program-arguments))
-	      (insert ")\n")))
-	(insert "(setq gnus-offline-hangup-program ")
-	(insert (prin1-to-string gnus-offline-hangup-program))
+	(insert "(setq pop3-fma-movemail-type '")
+	(insert (prin1-to-string pop3-fma-movemail-type))
 	(insert ")\n")
-	(if (stringp gnus-offline-hangup-program)
+	(if save-passwd
+	    (insert "(add-hook 'gnus-setup-news-hook \n    (lambda ()\n        (setq pop3-fma-save-password-information t)\n        (add-to-list 'gnus-variable-list 'pop3-fma-password)))\n"))
+	(if (eq pop3-fma-movemail-type 'exe)
 	    (progn
-	      (insert "(setq gnus-offline-hangup-program-arguments '")
-	      (insert (prin1-to-string gnus-offline-hangup-program-arguments))
-	      (insert ")\n")))
+	      (insert "(setq pop3-fma-movemail-arguments '")
+	      (insert (prin1-to-string pop3-fma-movemail-arguments))
+	      (insert ")\n"))))
+    ;; Write stting about mail-source.el
+    (insert "(setq gnus-offline-mail-source '")
+    (insert (prin1-to-string gnus-offline-mail-source))
+    (insert ")\n")
+    (insert "(setq nnmail-spool-file gnus-offline-mail-source)\n")
+    (insert "(require 'read-passwd)\n")
+    (insert "(setq mail-source-read-passwd 'read-pw-read-passwd)\n")
+    (insert "(add-hook 'gnus-setup-news-hook 'read-pw-set-mail-source-passwd-cache)\n")
+    (if save-passwd
+	(insert "(add-hook 'gnus-setup-news-hook \n    (lambda ()\n        (add-to-list 'gnus-variable-list 'mail-source-password-cache)))\n"))
+    )
+  (write-region (point-min) (point-max) gnus-offline-setting-file)
+  (kill-buffer "* Setting"))
 
-	;; write setting about MIEE.
-	(if gnus-offline-use-miee
-	    (progn
-	      (insert "(setq gnus-offline-mail-spool-directory ")
-	      (insert (prin1-to-string gnus-offline-mail-spool-directory))
-	      (insert ")\n")
-	      (insert "(setq gnus-offline-news-spool-directory ")
-	      (insert (prin1-to-string gnus-offline-news-spool-directory))
-	      (insert ")\n")
-	      (insert "(setq sendmail-to-spool-directory gnus-offline-mail-spool-directory)\n")
-	      (insert "(setq news-spool-request-post-directory gnus-offline-news-spool-directory)\n")
-	      (insert "(load \"miee\")\n")
-	      (insert "(setq message-send-news-function '")
-	      (insert (prin1-to-string message-send-news-function))
-	      (insert ")\n")))
-
-	;; write setting about nnspool and gnus-agent.
-	(if (equal gnus-offline-news-fetch-method 'nnspool)
-	    (insert "(message-offline-state)\n")
-	  (insert "(setq gnus-agent-directory ")
-	  (insert (prin1-to-string gnus-agent-directory))
-	  (insert ")\n"))
-
-	;; write setting about queue type -- MIEE or nnagent.
-	(insert "(setq gnus-offline-drafts-queue-type '")
-	(insert (prin1-to-string gnus-offline-drafts-queue-type))
-	(insert ")\n")
-	(insert "(setq gnus-offline-MTA-type '")
-	(insert (prin1-to-string gnus-offline-MTA-type))
-	(insert ")\n")
 
-	;; Offline setting for gnus-nntp-*
-	(insert "(setq gnus-nntp-service nil)\n")
-	(insert "(setq gnus-nntp-server nil)\n")
+;;; Suppport for customizing gnus-ofsetup parameters.
 
-	;; Write setting about hooks.
-	(insert "(add-hook 'gnus-group-mode-hook 'gnus-offline-processed-by-timer t)\n")
-	(insert "(add-hook 'gnus-group-mode-hook 'gnus-offline-error-check t)\n")
-	(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)
-	    (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")
+(autoload 'gnus-custom-mode "gnus-cus" nil t)
+
+(defun gnus-ofsetup-parameters ()
+  "Return alist of gnus-offline configuration parameters."
+  `((news-method
+     (choice :tag "News Method" :value ,gnus-offline-news-fetch-method
+	     (const :tag "Gnus Agent" nnagent)
+	     (const :tag "nnspool"    nnspool)) "\
+Method to fetch news articles.")
+
+    (dialup-program
+     (choice :tag "Dialup Program" :value ,gnus-offline-dialup-program
+	     (string :tag "Use Program..")
+	     (const :tag "Don't auto-dial." nil)) "\
+Program which does dial.")
+
+    (dialup-prog-args
+     (repeat :tag "Dialup Program Arguments"
+	     :value ,gnus-offline-dialup-program-arguments
+	     (string :tag "Argument"))"\
+Program arguments of gnus-offline-dialup-program.")
+
+    (hangup-program
+     (choice :tag "Hangup Program" :value ,gnus-offline-hangup-program
+	     (string :tag "Use Program..")
+	     (const :tag "Don't auto-hangup." nil)) "\
+Program which does hangup.")
+
+    (hangup-prog-args
+     (repeat :tag "Hangup Program Arguments"
+	     :value ,gnus-offline-hangup-program-arguments
+	     (string :tag "Argument")) "\
+Program arguments of gnus-offline-hangup-program.")
+
+    (interval
+     (integer :tag "Interval between Jobs"
+	      :value ,gnus-offline-interval-time) "\
+Interval time(minutes) to do online jobs.
+If set to 0 , timer call is disabled.")
+
+    (draft-type
+     (choice :tag "Drafts Queue Type" :value ,gnus-offline-drafts-queue-type
+	     (const :tag "Gnus Draft for queuing."    agent)
+	     (const :tag "I prefer MIEE for queuing." miee)) "\
+Type of queue used for draft messages.
+
+If the select method for news is nnspool, you must choose MIEE.
+MIEE is another library for offline messaging. It isn't part of
+Semi-gnus. If you want to know about MIEE, see README-offline.{en,ja}.")
+
+    (mail-spool
+     (directory :tag "Mail Spool Directory for MIEE"
+		:value ,(cond (gnus-offline-mail-spool-directory
+			       gnus-offline-mail-spool-directory)
+			      ((and (boundp 'sendmail-to-spool-directory)
+				    sendmail-to-spool-directory)
+			       sendmail-to-spool-directory)
+			      (t "~/"))))
+
+    (news-spool
+     (directory :tag "News Spool Directory for MIEE"
+		:value ,(cond (gnus-offline-news-spool-directory
+			       gnus-offline-news-spool-directory)
+			      ((and (boundp 'news-spool-request-post-directory)
+				    news-spool-request-post-directory)
+			       news-spool-request-post-directory)
+			      (t "~/"))))
+
+    (mta-type
+     (choice :tag "MTA Type" :value ,gnus-offline-MTA-type
+	     (const :tag "Use smtp.el"  smtp)
+	     (const :tag "Use sendmail" sendmail)) "\
+Type of MTA used for sending mail.")
+
+    (save-password
+     (choice :tag "Save Password in Startup File"
+	     :value ,(if (memq 'mail-source-password-cache gnus-variable-list)
+			 t
+			 nil)
+	     (const :tag "OK, I'm sure it's safe."     t)
+	     (const :tag "No way, it's too dangerous!" nil)) "\
+Whether you want your POP passwords written in .newsrc.eld or not.")
+    
+    (mail-source
+     (sexp :tag "Mail Sources" :value ,gnus-offline-mail-source) "\
+Information of mail sources. Actually, a list of `Mail Source Specifiers'.
+
+The format of this variable is just the same as `mail-sources' (or
+`nnmail-spool-file' which seems obsolete).
+
+`Mail Source Specifiers' can take a lot of keywords. For example,
+if you want to use movemail instead of pop3.el which comes with
+Gnus, you can set a specifier using the kerword :program as shown
+below:
+
+          (pop :program \"movemail -pf po:%u %t %p\")
+
+If you want to know more about mail source specifiers and keywords,
+click the button below.")))
+
+(defun gnus-ofsetup-customize ()
+  "Edit the gnus-offline parameters."
+  (interactive)
+  (let* ((params (gnus-ofsetup-parameters))
+	 (types (mapcar (lambda (entry)
+			 `(cons :format "%v%h\n"
+				:doc ,(nth 2 entry)
+				(const :format "" ,(nth 0 entry))
+				,(nth 1 entry)))
+			params)))
+  ;; Ready.
+  (kill-buffer (gnus-get-buffer-create "*Gnus Offline Customize*"))
+  (switch-to-buffer (gnus-get-buffer-create "*Gnus Offline Customize*"))
+  (gnus-custom-mode)
+  (widget-insert "Customize the Gnus Offline Parameters, and press ")
+  (widget-create 'push-button
+		   :tag "done"
+		   :help-echo "Push me when done customizing."
+		   :action 'gnus-ofsetup-customize-done)
+  (widget-insert "\n\n")
+  (make-local-variable 'gnus-ofsetup-params)
+  (setq gnus-ofsetup-params
+	(widget-create 'group
+		       `(set :inline t
+			     :greedy t
+			     :tag "Parameters"
+			     :format "%t:\n%h%v"
+			     :doc "\
+These paramerters will be saved in ~/.gnus-offline.el.
+
+Note: Touching these parameters may require Gnus or even Emacs to be
+restarted."
+			     ,@types)))
+  
+  (widget-create 'info-link
+		 :help-echo "Push me to learn more."
+		 :tag "<Info> mail sources"
+		 "(gnus)Mail Sources")
+
+  (use-local-map widget-keymap)
+  (local-set-key "q" 'bury-buffer)
+  (widget-setup)
+  (goto-char (point-min))))
+
+(defun gnus-ofsetup-customize-done (&rest ignore)
+  "Apply changes and bury the buffer."
+  (interactive)
+  (let ((params (widget-value gnus-ofsetup-params))
+	(combi '((news-method . gnus-offline-news-fetch-method)
+		 (dialup-program . gnus-offline-dialup-program)
+		 (dialup-prog-args . gnus-offline-dialup-program-arguments)
+		 (hangup-program . gnus-offline-hangup-program)
+		 (hangup-prog-args . gnus-offline-hangup-program-arguments)
+		 (interval . gnus-offline-interval-time)
+		 (draft-type . gnus-offline-drafts-queue-type)
+		 (mail-spool . gnus-offline-mail-spool-directory)
+		 (news-spool . gnus-offline-news-spool-directory)
+		 (mta-type . gnus-offline-MTA-type)
+		 (mail-source . gnus-offline-mail-source)
+		 (save-password . save-passwd)))
+	(save-passwd (and (memq 'mail-source-password-cache gnus-variable-list)
+			  t)))
+    (if (null params)
+	(gnus-message 4 "(No changes need to be saved)")
+      (mapcar (lambda (el)
+		(let ((sym (car el))
+		      (val (cdr el)))
+		  (set (cdr (assq sym combi)) val)
+		  (cond ((eq sym 'news-method)
+			 (if (eq val 'nnspool)
+			     (setq gnus-offline-use-miee t)))
+			((eq sym 'draft-type)
+			 (setq gnus-offline-use-miee
+			       (if (eq val 'miee) t nil)))
+			((eq sym 'save-password)
+			 (if val
+			     (add-to-list 'gnus-variable-list
+					  'mail-source-password-cache)
+			   (setq gnus-variable-list
+				 (delq 'mail-source-password-cache
+				       gnus-variable-list)))))))
+	      params)
+      (if (and (eq gnus-offline-news-fetch-method 'nnspool)
+	       (not (eq gnus-offline-drafts-queue-type 'miee)))
+	  (error "Invalid parameters. Check the news method and drafts queue type."))
+      (if gnus-offline-use-miee
+	  (gnus-ofsetup-prepare-for-miee))
+      (gnus-ofsetup-write-setting-file)))
+  (bury-buffer)
+  (switch-to-buffer gnus-group-buffer))
 
-	(if (not (locate-library "mail-source"))
-	    (progn
-	      ;; Write setting about pop3-fma.
-	      (insert "(require 'pop3-fma)\n")
-	      (insert "(add-hook 'message-send-hook 'pop3-fma-message-add-header)\n")
-	      (insert "(setq pop3-fma-spool-file-alist '")
-	      (insert (prin1-to-string pop3-fma-spool-file-alist))
-	      (insert ")\n")
-	      (insert "(setq pop3-fma-movemail-type '")
-	      (insert (prin1-to-string pop3-fma-movemail-type))
-	      (insert ")\n")
-	      (if save-passwd
-		  (insert "(add-hook 'gnus-setup-news-hook \n    (lambda ()\n        (setq pop3-fma-save-password-information t)\n        (add-to-list 'gnus-variable-list 'pop3-fma-password)))\n"))
-	      (if (eq pop3-fma-movemail-type 'exe)
-		  (progn
-		    (insert "(setq pop3-fma-movemail-arguments '")
-		    (insert (prin1-to-string pop3-fma-movemail-arguments))
-		    (insert ")\n"))))
-	  ;; Write stting about mail-source.el
-	  (insert "(setq gnus-offline-mail-source '")
-	  (insert (prin1-to-string gnus-offline-mail-source))
-	  (insert ")\n")
-	  (insert "(setq nnmail-spool-file gnus-offline-mail-source)\n")
-	  (insert "(require 'read-passwd)\n")
-	  (insert "(setq mail-source-read-passwd 'read-pw-read-passwd)\n")
-	  (insert "(add-hook 'gnus-setup-news-hook 'read-pw-set-mail-source-passwd-cache)\n")
-	  (if save-passwd
-	      (insert "(add-hook 'gnus-setup-news-hook \n    (lambda ()\n        (add-to-list 'gnus-variable-list 'mail-source-password-cache)))\n"))
-	  )
-	(write-region (point-min) (point-max) gnus-offline-setting-file)
-	(kill-buffer "* Setting"))
-    )
-  (load gnus-offline-setting-file))
 ;; gnus-ofsetup.el Ends here.
diff --git a/lisp/gnus.el b/lisp/gnus.el
index fa6046f..f412e7a 100644
--- a/lisp/gnus.el
+++ b/lisp/gnus.el
@@ -267,7 +267,7 @@ is restarted, and sometimes reloaded."
 (defconst gnus-version-number "6.10.072"
   "Version number for this version of gnus.")
 
-(defconst gnus-revision-number "00"
+(defconst gnus-revision-number "01"
   "Revision number for this version of gnus.")
 
 (defconst gnus-original-version-number "0.95"