Revert.

[elisp/riece.git] / lisp / riece-300.el

diff --git a/lisp/riece-300.el b/lisp/riece-300.el
index ab992c3..deed723 100644 (file)
--- a/lisp/riece-300.el
+++ b/lisp/riece-300.el
@@ -19,8 +19,8 @@
 
 ;; 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., 59 Temple Place - Suite 330,
-;; Boston, MA 02111-1307, USA.
+;; Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+;; Boston, MA 02110-1301, USA.
 
 ;;; Code:
 
@@ -252,9 +252,10 @@
        (if entry
            (setcdr entry
                    (concat (cdr entry)
-                           (substring string (match-end 0))))
+                           (substring string (match-end 0)) " "))
          (setq riece-353-message-alist
-               (cons (cons channel (substring string (match-end 0)))
+               (cons (cons channel
+                           (concat (substring string (match-end 0)) " "))
                      riece-353-message-alist))))))
 
 (defun riece-handle-322-message (prefix number name decoded)
@@ -267,7 +268,7 @@
     (setq parameters (riece-split-parameters
                      (riece-decoded-string-for-identity decoded
                                                         channel-identity))
-         topic (nth 1 parameters))
+         topic (nth 2 parameters))
     (riece-channel-set-topic (riece-get-channel channel) topic)
     (riece-insert-info buffer (concat visible " users, topic: " topic "\n"))
     (riece-insert-info
@@ -338,8 +339,8 @@
 
 (defun riece-handle-341-message (prefix number name string)
   (if (string-match "^\\([^ ]+\\) " string)
-      (let* ((channel (match-string 1 string))
-            (user (substring string (match-end 0)))
+      (let* ((channel (substring string (match-end 0)))
+            (user (match-string 1 string))
             (channel-identity (riece-make-identity channel riece-server-name))
             (buffer (riece-channel-buffer channel-identity)))
        (riece-insert-info buffer (concat "Inviting " user "\n"))
@@ -438,7 +439,7 @@
            (setq riece-353-message-alist
                  (delq entry riece-353-message-alist)))
        (while (string-match
-               (concat "\\([@+]\\)?\\([^ ]+\\) *")
+               (concat "\\([@+]\\)?\\([^ ]+\\) +")
                string start)
          (put-text-property (match-beginning 2) (match-end 2)
                             'riece-identity