aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorLars Ingebrigtsen2021-07-23 14:13:38 +0200
committerLars Ingebrigtsen2021-07-23 14:13:38 +0200
commitf3806ee149c698e2a87258c5ecdea8bc8aa88664 (patch)
treedd03a58a60c1551717ee82ab7c4bc9dca5733900
parentce04a88f3c0e0548eacff03018d7d7bdd88ec517 (diff)
downloademacs-f3806ee149c698e2a87258c5ecdea8bc8aa88664.tar.gz
emacs-f3806ee149c698e2a87258c5ecdea8bc8aa88664.zip
Fix an rcirc merge problem
* lisp/net/rcirc.el (rcirc-get-server-method) (rcirc-get-server-password): Remove double definition after merge.
-rw-r--r--lisp/net/rcirc.el16
1 files changed, 0 insertions, 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.")
631 (when (string-match server-i server) 631 (when (string-match server-i server)
632 (throw 'pass (car args))))))) 632 (throw 'pass (car args)))))))
633 633
634(defun rcirc-get-server-method (server)
635 (catch 'method
636 (dolist (i rcirc-authinfo)
637 (let ((server-i (car i))
638 (method (cadr i)))
639 (when (string-match server-i server)
640 (throw 'method method))))))
641
642(defun rcirc-get-server-password (server)
643 (catch 'pass
644 (dolist (i rcirc-authinfo)
645 (let ((server-i (car i))
646 (args (cdddr i)))
647 (when (string-match server-i server)
648 (throw 'pass (car args)))))))
649
650;;;###autoload 634;;;###autoload
651(defun rcirc-connect (server &optional port nick user-name 635(defun rcirc-connect (server &optional port nick user-name
652 full-name startup-channels password encryption 636 full-name startup-channels password encryption