[Emacs-diffs] Changes to emacs/lisp/url/url-auth.el, v [EMACS_22_BASE]

[Chong Yidong]

CVSROOT:        /sources/emacs
Module name:    emacs
Branch:         EMACS_22_BASE
Changes by:     Chong Yidong <cyd>      08/02/25 17:11:26

Index: url-auth.el
===================================================================
RCS file: /sources/emacs/emacs/lisp/url/url-auth.el,v
retrieving revision 1.13.2.7
retrieving revision 1.13.2.8
diff -u -b -r1.13.2.7 -r1.13.2.8
--- url-auth.el 25 Feb 2008 16:19:08 -0000      1.13.2.7
+++ url-auth.el 25 Feb 2008 17:11:25 -0000      1.13.2.8
@@ -158,7 +158,7 @@
        (setq file (cond
                    (realm realm)
                    ((string-match "/$" file) file)
-                   (t (url-basepath file)))
+                   (t (url-file-directory file)))
              server (format "%s:%d" server port)
              byserv (cdr-safe (assoc server url-digest-auth-storage)))
        (cond
@@ -188,8 +188,8 @@
                         (string= data (substring file 0 (length data)))))
                    (setq retval (cdr (car byserv))))
                (setq byserv (cdr byserv))))
-         (if overwrite
-             (if (and (not retval) prompt)
+         (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: ")