aboutsummaryrefslogtreecommitdiffstats
path: root/lisp/erc
diff options
context:
space:
mode:
authorF. Jason Park2022-11-24 21:03:03 -0800
committerF. Jason Park2022-12-09 06:35:36 -0800
commitdcf69a1da4a41c27cc3c8782c40df24678847f3e (patch)
tree05ecdf59775fd996aa81882467ba827359e8082b /lisp/erc
parentacd462b0306ead1b47278e810e11a3d66e4dd2cc (diff)
downloademacs-dcf69a1da4a41c27cc3c8782c40df24678847f3e.tar.gz
emacs-dcf69a1da4a41c27cc3c8782c40df24678847f3e.zip
Respect some spaces in auth-source-pass--match-regexp
* lisp/auth-source-pass.el (auth-source-pass--match-regexp): Allow an entry's host and user fields to contain spaces, just like other backends do. * lisp/erc/erc-compat.el (erc-compat--29-auth-source-pass--retrieve-parsed): Change regexp to allow spaces in host and user components of file names. * test/lisp/auth-source-pass-tests.el (auth-source-pass-any-host): Silence warning message re wildcards emitted by `auth-source-pass-search'. (auth-source-pass-extra-query-keywords--suffixed-user): Add spaces to users and hosts of some example entries. (Bug#58985.)
Diffstat (limited to 'lisp/erc')
-rw-r--r--lisp/erc/erc-compat.el8
1 files changed, 4 insertions, 4 deletions
diff --git a/lisp/erc/erc-compat.el b/lisp/erc/erc-compat.el
index abbaafcd936..bd932547586 100644
--- a/lisp/erc/erc-compat.el
+++ b/lisp/erc/erc-compat.el
@@ -176,12 +176,12 @@ If START or END is negative, it counts from the end."
176;; This hard codes `auth-source-pass-port-separator' to ":" 176;; This hard codes `auth-source-pass-port-separator' to ":"
177(defun erc-compat--29-auth-source-pass--retrieve-parsed (seen e port-number-p) 177(defun erc-compat--29-auth-source-pass--retrieve-parsed (seen e port-number-p)
178 (when (string-match (rx (or bot "/") 178 (when (string-match (rx (or bot "/")
179 (or (: (? (group-n 20 (+ (not (in " /:")))) "@") 179 (or (: (? (group-n 20 (+ (not (in "/:")))) "@")
180 (group-n 10 (+ (not (in " /:@")))) 180 (group-n 10 (+ (not (in "/:@"))))
181 (? ":" (group-n 30 (+ (not (in " /:")))))) 181 (? ":" (group-n 30 (+ (not (in " /:"))))))
182 (: (group-n 11 (+ (not (in " /:@")))) 182 (: (group-n 11 (+ (not (in "/:@"))))
183 (? ":" (group-n 31 (+ (not (in " /:"))))) 183 (? ":" (group-n 31 (+ (not (in " /:")))))
184 (? "/" (group-n 21 (+ (not (in " /:"))))))) 184 (? "/" (group-n 21 (+ (not (in "/:")))))))
185 eot) 185 eot)
186 e) 186 e)
187 (puthash e `( :host ,(or (match-string 10 e) (match-string 11 e)) 187 (puthash e `( :host ,(or (match-string 10 e) (match-string 11 e))