Merge from origin/emacs-24

[gnu-emacs] / lisp / url / url-irc.el

diff --git a/lisp/url/url-irc.el b/lisp/url/url-irc.el
index dd88a85a03ae767bd235a21f112093cfd0843626..bdccd8f178dfeb2e797f700e8c71d27f3d8966b2 100644 (file)
--- a/lisp/url/url-irc.el
+++ b/lisp/url/url-irc.el
@@ -1,15 +1,15 @@
 ;;; url-irc.el --- IRC URL interface
 
-;; Copyright (c) 1996 - 1999 Free Software Foundation, Inc.
+;; Copyright (C) 1996-1999, 2004-2015 Free Software Foundation, Inc.
 
 ;; Keywords: comm, data, processes
 
 ;; This file is part of GNU Emacs.
 
-;; GNU Emacs is free software; you can redistribute it and/or modify
+;; GNU Emacs is free software: you can redistribute it and/or modify
 ;; it under the terms of the GNU General Public License as published by
-;; the Free Software Foundation; either version 2, or (at your option)
-;; any later version.
+;; the Free Software Foundation, either version 3 of the License, or
+;; (at your option) any later version.
 
 ;; GNU Emacs is distributed in the hope that it will be useful,
 ;; but WITHOUT ANY WARRANTY; without even the implied warranty of
@@ -17,33 +17,38 @@
 ;; GNU General Public License for more details.
 
 ;; You should have received a copy of the GNU General Public License
-;; along with GNU Emacs; see the file COPYING.  If not, write to the
-;; Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
-;; Boston, MA 02110-1301, USA.
+;; along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
 
 ;;; Commentary:
 
-;; IRC URLs are defined in http://www.w3.org/Addressing/draft-mirashi-url-irc-01.txt
+;; IRC URLs are defined in
+;; http://www.w3.org/Addressing/draft-mirashi-url-irc-01.txt
 
 ;;; Code:
 
 (require 'url-vars)
 (require 'url-parse)
 
-(defconst url-irc-default-port 6667 "Default port for IRC connections")
+(defconst url-irc-default-port 6667 "Default port for IRC connections.")
 
-(defcustom url-irc-function 'url-irc-zenirc
-  "*Function to actually open an IRC connection.
-Should be a function that takes several argument:
+(defcustom url-irc-function 'url-irc-rcirc
+  "Function to actually open an IRC connection.
+The function should take the following 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)
 
+;; External.
+(declare-function zenirc "ext:zenirc" (&optional prefix))
+(declare-function zenirc-send-line "ext:zenirc" ())
+
 (defun url-irc-zenirc (host port channel user password)
   (let ((zenirc-buffer-name (if (and user host port)
                                (format "%s@%s:%d" user host port)
@@ -58,6 +63,15 @@ 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-handle-irc-url host port channel user password))
+
 ;;;###autoload
 (defun url-irc (url)
   (let* ((host (url-host url))
@@ -73,8 +87,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
 ;;; url-irc.el ends here