(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 --git a/lisp/url/url-auth.el b/lisp/url/url-auth.el
index 17e03fe280452da2db50c1dd4399f16fe235c536..584924c8cd61cf92f40c2bc1b0996c791a5d0a62 100644 (file)
--- a/lisp/url/url-auth.el
+++ b/lisp/url/url-auth.el
@@ -188,18 +188,18 @@ instead of hostname:portnum."
                         (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)))