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

[Vinicius Jose Latorre]

CVSROOT:        /sources/emacs
Module name:    emacs
Branch:         EMACS_22_BASE
Changes by:     Vinicius Jose Latorre <viniciusjl>      07/08/09 01:41:09

Index: url/url-auth.el
===================================================================
RCS file: /sources/emacs/emacs/lisp/url/url-auth.el,v
retrieving revision 1.13.2.2
retrieving revision 1.13.2.3
diff -u -b -r1.13.2.2 -r1.13.2.3
--- url/url-auth.el     8 Aug 2007 07:21:23 -0000       1.13.2.2
+++ url/url-auth.el     9 Aug 2007 01:41:08 -0000       1.13.2.3
@@ -68,7 +68,9 @@
         (server (url-host href))
         (port (url-port href))
         (path (url-filename href))
-        user pass byserv retval data)
+        (user (url-user href))
+        (pass (url-password href))
+        byserv retval data)
     (setq server (format "%s:%d" server port)
          path (cond
                (realm realm)
@@ -79,8 +81,8 @@
     (cond
      ((and prompt (not byserv))
       (setq user (read-string (url-auth-user-prompt url realm)
-                             (user-real-login-name))
-           pass (read-passwd "Password: "))
+                             (or user (user-real-login-name)))
+           pass (read-passwd "Password: " nil (or pass "")))
       (set url-basic-auth-storage
           (cons (list server
                       (cons path