summaryrefslogtreecommitdiff
path: root/lisp/url
diff options
context:
space:
mode:
authorGlenn Morris <rgm@gnu.org>2012-01-12 00:11:24 -0800
committerGlenn Morris <rgm@gnu.org>2012-01-12 00:11:24 -0800
commitd8d469ef271a0f8191af47ce57bd27e5e88851f3 (patch)
tree178c94a84ffd4c054c6c118c869f6d7806e64e5c /lisp/url
parent04e74403a1b12aede05915df869170ab5ca0e253 (diff)
downloademacs-d8d469ef271a0f8191af47ce57bd27e5e88851f3.tar.gz
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
Diffstat (limited to 'lisp/url')
-rw-r--r--lisp/url/ChangeLog5
-rw-r--r--lisp/url/url-auth.el1
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