* lisp/net/rcirc.el (rcirc-handler-353): Fix bug for channels which the

user has not joined.

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 11b648367fccc77e1515aab5982ecd96968b9d52..835fc7287e6176751bd20205cdfbc544b4189f3b 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,8 @@
+2011-04-28  Deniz Dogan  <deniz@dogan.se>
+
+       * net/rcirc.el (rcirc-handler-353): Fix bug for channels which the
+       user has not joined.
+
 2011-04-28  Stefan Monnier  <monnier@iro.umontreal.ca>
 
        * pcomplete.el (pcomplete-completions-at-point): Return nil if there

diff --git a/lisp/net/rcirc.el b/lisp/net/rcirc.el
index 663c1ded9f14775be27be1d8b3b746bec286d1ab..148c9b7b2973b5dfbe91478ee22d3c52647de774 100644 (file)
--- a/lisp/net/rcirc.el
+++ b/lisp/net/rcirc.el
@@ -2741,10 +2741,13 @@ the only argument."
 
 (defun rcirc-handler-353 (process sender args text)
   "RPL_NAMREPLY"
-  (let ((channel (caddr args)))
+  (let ((channel (nth 2 args))
+       (names (or (nth 3 args) "")))
     (mapc (lambda (nick)
             (rcirc-put-nick-channel process nick channel))
-          (split-string (cadddr args) " " t))
+          (split-string names " " t))
+    ;; create a temporary buffer to insert the names into
+    ;; rcirc-handler-366 (RPL_ENDOFNAMES) will handle it
     (with-current-buffer (rcirc-get-temp-buffer-create process channel)
       (goto-char (point-max))
       (insert (car (last args)) " "))))