aboutsummaryrefslogtreecommitdiffstats
path: root/lisp
diff options
context:
space:
mode:
authorGlenn Morris2012-01-12 00:14:41 -0800
committerGlenn Morris2012-01-12 00:14:41 -0800
commite7a8cb8f8212d717147d561a78f6322e951b14e3 (patch)
tree7179447f992c73c516443e515384c5f70343c674 /lisp
parentd8d469ef271a0f8191af47ce57bd27e5e88851f3 (diff)
downloademacs-e7a8cb8f8212d717147d561a78f6322e951b14e3.tar.gz
emacs-e7a8cb8f8212d717147d561a78f6322e951b14e3.zip
* url-auth.el (url-digest-auth): Copy previous url-basic-auth change.
Diffstat (limited to 'lisp')
-rw-r--r--lisp/url/ChangeLog5
-rw-r--r--lisp/url/url-auth.el1
2 files changed, 4 insertions, 2 deletions
diff --git a/lisp/url/ChangeLog b/lisp/url/ChangeLog
index 99a07ec60fe..f011a8d1dc0 100644
--- a/lisp/url/ChangeLog
+++ b/lisp/url/ChangeLog
@@ -1,7 +1,8 @@
12012-01-12 Glenn Morris <rgm@gnu.org> 12012-01-12 Glenn Morris <rgm@gnu.org>
2 2
3 * url-auth.el (url-basic-auth): Allow reading usernames etc when 3 * url-auth.el (url-basic-auth, url-digest-auth):
4 the minibuffer is already in use, eg in url-handler-mode. (Bug#10298) 4 Allow reading usernames etc when the minibuffer is already in use,
5 eg in url-handler-mode. (Bug#10298)
5 6
62011-11-15 Juanma Barranquero <lekktu@gmail.com> 72011-11-15 Juanma Barranquero <lekktu@gmail.com>
7 8
diff --git a/lisp/url/url-auth.el b/lisp/url/url-auth.el
index aebc3c268b4..f7e53eafb44 100644
--- a/lisp/url/url-auth.el
+++ b/lisp/url/url-auth.el
@@ -164,6 +164,7 @@ instead of hostname:portnum."
164 (type (url-type href)) 164 (type (url-type href))
165 (port (url-port href)) 165 (port (url-port href))
166 (file (url-filename href)) 166 (file (url-filename href))
167 (enable-recursive-minibuffers t)
167 user pass byserv retval data) 168 user pass byserv retval data)
168 (setq file (cond 169 (setq file (cond
169 (realm realm) 170 (realm realm)