aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorKrzysztof Jurewicz2015-12-27 09:04:02 +0100
committerLars Ingebrigtsen2015-12-27 09:04:02 +0100
commitf9d87dd8791d4e77929f21e4f73d92ef966722cc (patch)
tree4b8f734851697eadb63c1e537cc674f6325cc425
parent6ae0aa6a504c6023dfe234b507c95f146d668436 (diff)
downloademacs-f9d87dd8791d4e77929f21e4f73d92ef966722cc.tar.gz
emacs-f9d87dd8791d4e77929f21e4f73d92ef966722cc.zip
Fix auth source lookups from erc with port numbers
* lisp/erc/erc.el (erc-open): `auth-source' wants strings, not port numbers (bug#20541). Copyright-paperwork-exempt: yes
-rw-r--r--lisp/erc/erc.el3
1 files changed, 2 insertions, 1 deletions
diff --git a/lisp/erc/erc.el b/lisp/erc/erc.el
index 70e37348b6a..04e99c7b884 100644
--- a/lisp/erc/erc.el
+++ b/lisp/erc/erc.el
@@ -2025,7 +2025,8 @@ Returns the buffer for the given server or channel."
2025 (auth-source-search :host server 2025 (auth-source-search :host server
2026 :max 1 2026 :max 1
2027 :user nick 2027 :user nick
2028 :port port 2028 ;; secrets.el wouldn’t accept a number
2029 :port (if (numberp port) (number-to-string port) port)
2029 :require '(:secret))) 2030 :require '(:secret)))
2030 :secret))) 2031 :secret)))
2031 (if (functionp secret) 2032 (if (functionp secret)