X-Git-Url: http://git.chise.org/gitweb/?a=blobdiff_plain;f=lisp%2Fgnus-ofsetup.el;h=5bfc6df9957c027d218afdff37c939b21355fad1;hb=8047583c8c86a5c6a61bddc27b391042e39e1ce5;hp=15a3eeb1c7ce660b87aefb0d82fc1c3d7f98e372;hpb=1f2b93a24df7b9914dbbc1a26a6e76c8da6511d1;p=elisp%2Fgnus.git-

diff --git a/lisp/gnus-ofsetup.el b/lisp/gnus-ofsetup.el
index 15a3eeb..5bfc6df 100644
--- a/lisp/gnus-ofsetup.el
+++ b/lisp/gnus-ofsetup.el
@@ -35,8 +35,6 @@
 
 (eval-when-compile (require 'cl))
 
-(require 'read-passwd)
-
 (eval-and-compile
   (defvar gnus-offline-lang
     (cond ((and (featurep 'meadow)
@@ -145,7 +143,7 @@
 			  "(add-hook"
 			  "'gnus-before-startup-hook"
 			  "(lambda () (setq nnmail-spool-file nil)
-           (setq mail-sources nil)))")))
+	   (setq mail-sources nil)))")))
 
 	;; Write stting about mail-source.el
 	(insert "(setq gnus-offline-mail-source '"
@@ -251,7 +249,7 @@ 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\")
+	  (pop :program \"movemail -pf po:%u %t %p\")
 
 If you want to know more about mail source specifiers and keywords,
 click the button below.")
@@ -334,7 +332,7 @@ POP パスワードを .newsrc.eld に保存するか否かを指定します。")
 (movemail など) を使いたい、という場合には、:program をいうキーワー
 ドを指定して以下の様に記述します。
 
-        (pop :program \"movemail -pf po:%u %t %p\")
+	(pop :program \"movemail -pf po:%u %t %p\")
 
 mail source specifier とか上記のようなキーワードについてもっとよく
 知りたい場合は、以下のボタンをクリックしてください。(Info の該当箇所
@@ -503,7 +501,7 @@ mail source specifier とか上記のようなキーワードについてもっとよく
 			  exec-directory "movemail"))
 	      (setq args (read-from-minibuffer
 			  (format "<%d of %d> %s" j n
-				  (gnus-ofsetup-gettext 'setup-18) "-pf")))
+				  (gnus-ofsetup-gettext 'setup-18)) "-pf"))
 	      (setq program (format "%s %s %s %s %s"
 				    prog args "po:%u" "%t" "%p"))))
 	  (when (string= type "imap")
@@ -629,7 +627,7 @@ mail source specifier とか上記のようなキーワードについてもっとよく
      (choice :tag ,(gnus-ofsetup-gettext 'param-save-passwd-1)
 	     :value ,(if (memq 'mail-source-password-cache gnus-variable-list)
 			 t
-			 nil)
+		       nil)
 	     (const :tag ,(gnus-ofsetup-gettext 'param-save-passwd-2) t)
 	     (const :tag ,(gnus-ofsetup-gettext 'param-save-passwd-3) nil))
      ,(gnus-ofsetup-gettext 'param-save-passwd-4))
@@ -651,36 +649,36 @@ mail source specifier とか上記のようなキーワードについてもっとよく
 				   (const :format "" ,(nth 0 entry))
 				   ,(nth 1 entry)))
 			params)))
-  (kill-buffer (gnus-get-buffer-create "*Gnus Offline Customize*"))
-  (switch-to-buffer (gnus-get-buffer-create "*Gnus Offline Customize*"))
-  (gnus-custom-mode)
-  (widget-insert (gnus-ofsetup-gettext 'customize-1))
-  (widget-create 'push-button
+    (kill-buffer (gnus-get-buffer-create "*Gnus Offline Customize*"))
+    (switch-to-buffer (gnus-get-buffer-create "*Gnus Offline Customize*"))
+    (gnus-custom-mode)
+    (widget-insert (gnus-ofsetup-gettext 'customize-1))
+    (widget-create 'push-button
 		   :tag (gnus-ofsetup-gettext 'customize-2)
 		   :help-echo (gnus-ofsetup-gettext 'customize-3)
 		   :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 ,(gnus-ofsetup-gettext 'customize-4)
-			     :format "%t:\n%h%v"
-			     :doc ,(gnus-ofsetup-gettext 'customize-5)
-			     ,@types)))
-
-  (widget-create 'info-link
-		 :help-echo (gnus-ofsetup-gettext 'customize-6)
-		 :tag "<Info> mail sources"
-		 (if (string-match "^ja" gnus-offline-lang)
-		     "(gnus-ja)Mail Sources"
-		   "(gnus)Mail Sources"))
-
-  (use-local-map widget-keymap)
-  (local-set-key "q" 'bury-buffer)
-  (widget-setup)
-  (goto-char (point-min))))
+    (widget-insert "\n\n")
+    (make-local-variable 'gnus-ofsetup-params)
+    (setq gnus-ofsetup-params
+	  (widget-create 'group
+			 `(set :inline t
+			       :greedy t
+			       :tag ,(gnus-ofsetup-gettext 'customize-4)
+			       :format "%t:\n%h%v"
+			       :doc ,(gnus-ofsetup-gettext 'customize-5)
+			       ,@types)))
+
+    (widget-create 'info-link
+		   :help-echo (gnus-ofsetup-gettext 'customize-6)
+		   :tag "<Info> mail sources"
+		   (if (string-match "^ja" gnus-offline-lang)
+		       "(gnus-ja)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."
@@ -753,8 +751,6 @@ mail source specifier とか上記のようなキーワードについてもっとよく
   '(add-hook 'gnus-after-getting-new-news-hook 'gnus-offline-after-get-new-news))
 (eval-after-load "message"
   '(add-hook 'message-send-hook 'gnus-offline-message-add-header))
-(setq mail-source-read-passwd 'read-pw-read-passwd)
-(add-hook 'gnus-setup-news-hook 'read-pw-set-mail-source-passwd-cache)
 
 (provide 'gnus-ofsetup)