From: Romain Francoise <romain@orebokech.com>
Date: Mon, 27 Mar 2006 20:23:47 +0000 (+0000)
Subject: (url-irc-rcirc, url-irc-erc): New functions.
X-Git-Tag: emacs-pretest-22.0.90~3413
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=7608c40cd1310013a88b3b1ac4a1c2208a53ab44;p=emacs.git

(url-irc-rcirc, url-irc-erc): New functions.
(url-irc-function): Add rcirc and ERC to the list of IRC clients.
Default to rcirc, since ZenIRC isn't part of Emacs.
---

diff --git a/lisp/url/ChangeLog b/lisp/url/ChangeLog
index 60a279356b8..e7e358bb894 100644
--- a/lisp/url/ChangeLog
+++ b/lisp/url/ChangeLog
@@ -1,3 +1,9 @@
+2006-03-27  Romain Francoise  <romain@orebokech.com>
+
+	* url-irc.el (url-irc-rcirc, url-irc-erc): New functions.
+	(url-irc-function): Add rcirc and ERC to the list of IRC clients.
+	Default to rcirc, since ZenIRC isn't part of Emacs.
+
 2006-03-07  Stefan Monnier  <monnier@iro.umontreal.ca>
 
 	* url-http.el (url-http-find-free-connection): Fix braino in last fix.
diff --git a/lisp/url/url-irc.el b/lisp/url/url-irc.el
index a876657d393..17755ff88e1 100644
--- a/lisp/url/url-irc.el
+++ b/lisp/url/url-irc.el
@@ -33,15 +33,17 @@
 
 (defconst url-irc-default-port 6667 "Default port for IRC connections")
 
-(defcustom url-irc-function 'url-irc-zenirc
+(defcustom url-irc-function 'url-irc-rcirc
   "*Function to actually open an IRC connection.
-Should be a function that takes several argument:
+Should be a function that takes several arguments:
     HOST - the hostname of the IRC server to contact
     PORT - the port number of the IRC server to contact
  CHANNEL - What channel on the server to visit right away (can be nil)
     USER - What username to use
 PASSWORD - What password to use"
-  :type '(choice (const :tag "ZEN IRC" :value 'url-irc-zenirc)
+  :type '(choice (const :tag "rcirc" :value url-irc-rcirc)
+		 (const :tag "ERC" :value url-irc-erc)
+		 (const :tag "ZEN IRC" :value url-irc-zenirc)
 		 (function :tag "Other"))
   :group 'url)
 
@@ -59,6 +61,16 @@ PASSWORD - What password to use"
       (insert "/join " channel)
       (zenirc-send-line))))
 
+(defun url-irc-rcirc (host port channel user password)
+  (let ((chan (when channel (concat "#" channel))))
+    (rcirc-connect host port user nil nil (when chan (list chan)))
+    (when chan
+      (switch-to-buffer (concat chan "@" host)))))
+
+(defun url-irc-erc (host port channel user password)
+  (erc-select :server host :port port :nick user :password password)
+  (erc-join-channel channel))
+
 ;;;###autoload
 (defun url-irc (url)
   (let* ((host (url-host url))
@@ -74,7 +86,7 @@ PASSWORD - What password to use"
 	(setq chan nil))
     (funcall url-irc-function host port chan user pass)
     nil))
-    
+
 (provide 'url-irc)
 
 ;;; arch-tag: 2e5eecf8-9eb3-436b-9fbd-c26f2fb2bf3e