[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
master f3806ee: Fix an rcirc merge problem
From: |
Lars Ingebrigtsen |
Subject: |
master f3806ee: Fix an rcirc merge problem |
Date: |
Fri, 23 Jul 2021 08:13:46 -0400 (EDT) |
branch: master
commit f3806ee149c698e2a87258c5ecdea8bc8aa88664
Author: Lars Ingebrigtsen <larsi@gnus.org>
Commit: Lars Ingebrigtsen <larsi@gnus.org>
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 7965372..f11f36e 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
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- master f3806ee: Fix an rcirc merge problem,
Lars Ingebrigtsen <=