[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
master 74386ab 4/4: ; Simplify rcirc authentication querying functions
From: |
Philip Kaludercic |
Subject: |
master 74386ab 4/4: ; Simplify rcirc authentication querying functions |
Date: |
Sun, 21 Nov 2021 13:00:56 -0500 (EST) |
branch: master
commit 74386abc0ff14affe2a9564c681d9e53cfe418e2
Author: Omar Polo <op@omarpolo.com>
Commit: Philip Kaludercic <philipk@posteo.net>
; Simplify rcirc authentication querying functions
---
lisp/net/rcirc.el | 21 +++------------------
1 file changed, 3 insertions(+), 18 deletions(-)
diff --git a/lisp/net/rcirc.el b/lisp/net/rcirc.el
index 6030db9..b4e9031 100644
--- a/lisp/net/rcirc.el
+++ b/lisp/net/rcirc.el
@@ -654,30 +654,15 @@ See `rcirc-connect' for more details on these variables.")
(defun rcirc-get-server-method (server)
"Return authentication method for SERVER."
- (catch 'method
- (dolist (i rcirc-authinfo)
- (let ((server-i (car i))
- (method (cadr i)))
- (when (string-match server-i server)
- (throw 'method method))))))
+ (cadr (assoc server rcirc-authinfo #'string-match)))
(defun rcirc-get-server-password (server)
"Return password for SERVER."
- (catch 'pass
- (dolist (i rcirc-authinfo)
- (let ((server-i (car i))
- (args (cdddr i)))
- (when (string-match server-i server)
- (throw 'pass (car args)))))))
+ (cadddr (assoc server rcirc-authinfo #'string-match)))
(defun rcirc-get-server-cert (server)
"Return a list of key and certificate for SERVER."
- (catch 'cert
- (dolist (i rcirc-authinfo)
- (let ((server-i (car i))
- (args (cddr i)))
- (when (string-match server-i server)
- (throw 'cert args))))))
+ (cddr (assoc server rcirc-authinfo #'string-match)))
;;;###autoload
(defun rcirc-connect (server &optional port nick user-name