aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorLars Ingebrigtsen2019-05-15 07:34:35 +0200
committerLars Ingebrigtsen2019-05-15 07:34:35 +0200
commitceed3d7557a93ae1a231c65c08ac787a10b8bad7 (patch)
tree7c4b60a6c69b60fbeb55e2a09941b0435b402e39
parent4f1df40db36b221e7842bd75d6281922dcb268ee (diff)
downloademacs-ceed3d7557a93ae1a231c65c08ac787a10b8bad7.tar.gz
emacs-ceed3d7557a93ae1a231c65c08ac787a10b8bad7.zip
Don't have url-basic-auth bug out when called with an URL string
* lisp/url/url-auth.el (url-basic-auth): Pass the parsed URL object to the prompting function instead of the parameter that's possibly a string (bug#26708). Passing url-basic-auth with a string parameter would fail if passed a non-parsed URL.
-rw-r--r--lisp/url/url-auth.el4
1 files changed, 2 insertions, 2 deletions
diff --git a/lisp/url/url-auth.el b/lisp/url/url-auth.el
index f644787cc64..beed7c6cb62 100644
--- a/lisp/url/url-auth.el
+++ b/lisp/url/url-auth.el
@@ -86,7 +86,7 @@ instead of the filename inheritance method."
86 ((and prompt (not byserv)) 86 ((and prompt (not byserv))
87 (setq user (or 87 (setq user (or
88 (url-do-auth-source-search server type :user) 88 (url-do-auth-source-search server type :user)
89 (read-string (url-auth-user-prompt url realm) 89 (read-string (url-auth-user-prompt href realm)
90 (or user (user-real-login-name)))) 90 (or user (user-real-login-name))))
91 pass (or 91 pass (or
92 (url-do-auth-source-search server type :secret) 92 (url-do-auth-source-search server type :secret)
@@ -115,7 +115,7 @@ instead of the filename inheritance method."
115 (progn 115 (progn
116 (setq user (or 116 (setq user (or
117 (url-do-auth-source-search server type :user) 117 (url-do-auth-source-search server type :user)
118 (read-string (url-auth-user-prompt url realm) 118 (read-string (url-auth-user-prompt href realm)
119 (user-real-login-name))) 119 (user-real-login-name)))
120 pass (or 120 pass (or
121 (url-do-auth-source-search server type :secret) 121 (url-do-auth-source-search server type :secret)