2 files changed, 6 insertions, 1 deletions

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 57339a8fee9..e0cb03f14fc 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,7 @@
+2011-03-03  Deniz Dogan  <deniz.a.m.dogan@gmail.com>
+
+        * net/rcirc.el (rcirc-cmd-join): Accept comma-separated input.
+
 2011-03-03  Christian Ohler  <ohler@gnu.org>
 
         * emacs-lisp/ert.el (ert--explain-equal): New function.
diff --git a/lisp/net/rcirc.el b/lisp/net/rcirc.el
index 1d419dbfa18..644f7eca10f 100644
--- a/lisp/net/rcirc.el
+++ b/lisp/net/rcirc.el
@@ -2104,7 +2104,8 @@ CHANNELS is a comma- or space-separated string of channel names."
   (let* ((split-channels (split-string channels "[ ,]" t))
          (buffers (mapcar (lambda (ch)
                             (rcirc-get-buffer-create process ch))
-                          split-channels)))
+                          split-channels))
+         (channels (mapconcat 'identity split-channels ",")))
     (rcirc-send-string process (concat "JOIN " channels))
     (when (not (eq (selected-window) (minibuffer-window)))
       (dolist (b buffers) ;; order the new channel buffers in the buffer list