# HG changeset patch
# User Chong Yidong <cyd@stupidchicken.com>
# Date 1207000944 0
# Node ID bc43e42e2fb4b806251403388dce1a8693515a79
# Parent  52454b9e8627f364ae67de80d082bccb233eb466
(url-digest-auth): Changed an if so that the interaction between the
PROMPT and OVERWRITE arguments can no longer result in the user being
queried twice for the same login and password information.

diff -r 52454b9e8627 -r bc43e42e2fb4 lisp/url/url-auth.el
--- a/lisp/url/url-auth.el	Mon Mar 31 22:02:08 2008 +0000
+++ b/lisp/url/url-auth.el	Mon Mar 31 22:02:24 2008 +0000
@@ -188,18 +188,18 @@
 			 (string= data (substring file 0 (length data)))))
 		    (setq retval (cdr (car byserv))))
 		(setq byserv (cdr byserv))))
-	  (if (or (and (not retval) prompt) overwrite)
-	      (progn
-		(setq user (read-string (url-auth-user-prompt url realm)
-					(user-real-login-name))
-		      pass (read-passwd "Password: ")
-		      retval (setq retval
-				   (cons user
-					 (url-digest-auth-create-key
-					  user pass realm
-					  (or url-request-method "GET")
-					  url)))
-		      byserv (assoc server url-digest-auth-storage))
+	  (if overwrite
+	      (if (and (not retval) prompt)
+		  (setq user (read-string (url-auth-user-prompt url realm)
+					  (user-real-login-name))
+			pass (read-passwd "Password: ")
+			retval (setq retval
+				     (cons user
+					   (url-digest-auth-create-key
+					    user pass realm
+					    (or url-request-method "GET")
+					    url)))
+			byserv (assoc server url-digest-auth-storage))
 		(setcdr byserv
 			(cons (cons file retval) (cdr byserv))))))
 	 (t (setq retval nil)))