diff options
| author | Glenn Morris | 2012-01-12 00:11:24 -0800 |
|---|---|---|
| committer | Glenn Morris | 2012-01-12 00:11:24 -0800 |
| commit | d8d469ef271a0f8191af47ce57bd27e5e88851f3 (patch) | |
| tree | 178c94a84ffd4c054c6c118c869f6d7806e64e5c | |
| parent | 04e74403a1b12aede05915df869170ab5ca0e253 (diff) | |
| download | emacs-d8d469ef271a0f8191af47ce57bd27e5e88851f3.tar.gz emacs-d8d469ef271a0f8191af47ce57bd27e5e88851f3.zip | |
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
| -rw-r--r-- | lisp/url/ChangeLog | 5 | ||||
| -rw-r--r-- | lisp/url/url-auth.el | 1 |
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 @@ | |||
| 1 | 2012-01-12 Glenn Morris <rgm@gnu.org> | ||
| 2 | |||
| 3 | * url-auth.el (url-basic-auth): Allow reading usernames etc when | ||
| 4 | the minibuffer is already in use, eg in url-handler-mode. (Bug#10298) | ||
| 5 | |||
| 1 | 2011-11-15 Juanma Barranquero <lekktu@gmail.com> | 6 | 2011-11-15 Juanma Barranquero <lekktu@gmail.com> |
| 2 | 7 | ||
| 3 | * url-dav.el (url-dav-delete-file): Fix typo. | 8 | * 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." | |||
| 69 | (file (url-filename href)) | 69 | (file (url-filename href)) |
| 70 | (user (url-user href)) | 70 | (user (url-user href)) |
| 71 | (pass (url-password href)) | 71 | (pass (url-password href)) |
| 72 | (enable-recursive-minibuffers t) ; for url-handler-mode (bug#10298) | ||
| 72 | byserv retval data) | 73 | byserv retval data) |
| 73 | (setq server (format "%s:%d" server port) | 74 | (setq server (format "%s:%d" server port) |
| 74 | file (cond | 75 | file (cond |