url-auth fix for password-protected urls in url-handler-mode.

* lisp/usr/url-auth.el (url-basic-auth): Allow reading usernames etc
when the minibuffer is already in use, eg in url-handler-mode.

Fixes: debbugs:10298

diff --git a/lisp/url/ChangeLog b/lisp/url/ChangeLog
index 4c28ae3f1a9d695e9e72ff818c522b6bd5101b29..99a07ec60febe87f99a35b70fef63166a50d6ac1 100644 (file)
--- a/lisp/url/ChangeLog
+++ b/lisp/url/ChangeLog
@@ -1,3 +1,8 @@
+2012-01-12  Glenn Morris  <rgm@gnu.org>
+
+       * url-auth.el (url-basic-auth): Allow reading usernames etc when
+       the minibuffer is already in use, eg in url-handler-mode.  (Bug#10298)
+
 2011-11-15  Juanma Barranquero  <lekktu@gmail.com>
 
        * url-dav.el (url-dav-delete-file): Fix typo.

diff --git a/lisp/url/url-auth.el b/lisp/url/url-auth.el
index be3076985750b9a77ab16b8e6cab2edff021a15d..aebc3c268b4f117da06fa38e532c78be3a58b105 100644 (file)
--- a/lisp/url/url-auth.el
+++ b/lisp/url/url-auth.el
@@ -69,6 +69,7 @@ instead of the filename inheritance method."
         (file (url-filename href))
         (user (url-user href))
         (pass (url-password href))
+        (enable-recursive-minibuffers t) ; for url-handler-mode (bug#10298)
         byserv retval data)
     (setq server (format "%s:%d" server port)
          file (cond