2 files changed, 6 insertions, 0 deletions

diff --git a/lisp/url/ChangeLog b/lisp/url/ChangeLog
index 4c28ae3f1a9..99a07ec60fe 100644
--- 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 be307698575..aebc3c268b4 100644
--- 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