From: yamaoka <yamaoka>
Date: Thu, 6 May 1999 02:07:11 +0000 (+0000)
Subject: Use the original source without any changes.
X-Git-Tag: t-gnus-6_10_064-01~3
X-Git-Url: http://git.chise.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=764ff1c69f1813f20eebd9afd008d3915713580e;p=elisp%2Fgnus.git-

Use the original source without any changes.
---

diff --git a/lisp/mail-source.el b/lisp/mail-source.el
index 587cb9e..acd758c 100644
--- a/lisp/mail-source.el
+++ b/lisp/mail-source.el
@@ -312,7 +312,7 @@ If ARGS, PROMPT is used as an argument to `format'."
     (when prescript
       (if (and (symbolp prescript) (fboundp prescript))
 	  (funcall prescript)
-	(call-process shell-file-name nil 0 nil
+	(call-process shell-file-name nil nil nil
 		      shell-command-switch 
 		      (format-spec
 		       prescript
@@ -324,7 +324,7 @@ If ARGS, PROMPT is used as an argument to `format'."
 	    (when prescript
 	      (if (and (symbolp prescript) (fboundp prescript))
 		  (funcall prescript)
-		(call-process shell-file-name nil 0 nil
+		(call-process shell-file-name nil nil nil
 			      shell-command-switch 
 			      (format-spec
 			       postscript
@@ -351,8 +351,8 @@ If ARGS, PROMPT is used as an argument to `format'."
       (if (and (symbolp prescript)
 	       (fboundp prescript))
 	  (funcall prescript)
-	(call-process shell-file-name nil nil nil
-		      shell-command-switch
+	(call-process shell-file-name nil 0 nil
+		      shell-command-switch 
 		      (format-spec
 		       prescript
 		       (format-spec-make ?p password ?t mail-source-crash-box
@@ -360,13 +360,14 @@ If ARGS, PROMPT is used as an argument to `format'."
     (let ((from (format "%s:%s:%s" server user port))
 	  (mail-source-string (format "pop:%s@%s" user server))
 	  result)
-      (setq password
-	    (or password
-		(cdr (assoc from mail-source-password-cache))
-		(mail-source-read-passwd
-		 (format "Password for %s at %s: " user server))))
-      (unless (assoc from mail-source-password-cache)
-	(push (cons from password) mail-source-password-cache))
+      (when (eq authentication 'password)
+	(setq password
+	      (or password
+		  (cdr (assoc from mail-source-password-cache))
+		  (mail-source-read-passwd
+		   (format "Password for %s at %s: " user server))))
+	(unless (assoc from mail-source-password-cache)
+	  (push (cons from password) mail-source-password-cache)))
       (when server
 	(setenv "MAILHOST" server))
       (setq result
@@ -395,8 +396,8 @@ If ARGS, PROMPT is used as an argument to `format'."
 	      (if (and (symbolp postscript)
 		       (fboundp postscript))
 		  (funcall prescript)
-		(call-process shell-file-name nil nil nil
-			      shell-command-switch
+		(call-process shell-file-name nil 0 nil
+			      shell-command-switch 
 			      (format-spec
 			       postscript
 			       (format-spec-make