From f3806ee149c698e2a87258c5ecdea8bc8aa88664 Mon Sep 17 00:00:00 2001 From: Lars Ingebrigtsen Date: Fri, 23 Jul 2021 14:13:38 +0200 Subject: [PATCH] Fix an rcirc merge problem * lisp/net/rcirc.el (rcirc-get-server-method) (rcirc-get-server-password): Remove double definition after merge. --- lisp/net/rcirc.el | 16 ---------------- 1 file changed, 16 deletions(-) diff --git a/lisp/net/rcirc.el b/lisp/net/rcirc.el index 79653728e5c..f11f36e8096 100644 --- a/lisp/net/rcirc.el +++ b/lisp/net/rcirc.el @@ -631,22 +631,6 @@ See `rcirc-connect' for more details on these variables.") (when (string-match server-i server) (throw 'pass (car args))))))) -(defun rcirc-get-server-method (server) - (catch 'method - (dolist (i rcirc-authinfo) - (let ((server-i (car i)) - (method (cadr i))) - (when (string-match server-i server) - (throw 'method method)))))) - -(defun rcirc-get-server-password (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))))))) - ;;;###autoload (defun rcirc-connect (server &optional port nick user-name full-name startup-channels password encryption -- 2.39.2