From: ueno <ueno>
Date: Mon, 1 Mar 2004 02:46:19 +0000 (+0000)
Subject: * riece-display.el (riece-display-connect-signals): Fixed bug in
X-Git-Tag: signal-slot-mergepoint~12
X-Git-Url: http://git.chise.org/gitweb/?a=commitdiff_plain;h=ee31849d8c55dc866e4d333003dfd5946b2ed19f;p=elisp%2Friece.git

* riece-display.el (riece-display-connect-signals): Fixed bug in
signal filters.

* riece-handle.el (riece-handle-mode-message): Don't call
riece-parse-channel-modes if channel doesn't match with
riece-channel-regexp.
---

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 3748ff3..924f32d 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,12 @@
+2004-03-01  Daiki Ueno  <ueno@unixuser.org>
+
+	* riece-display.el (riece-display-connect-signals): Fixed bug in
+	signal filters.
+
+	* riece-handle.el (riece-handle-mode-message): Don't call
+	riece-parse-channel-modes if channel doesn't match with
+	riece-channel-regexp.
+
 2004-02-28  Daiki Ueno  <ueno@unixuser.org>
 
 	* riece-display.el (riece-display-connect-signals): Connect some
diff --git a/lisp/riece-display.el b/lisp/riece-display.el
index 9e65095..56a9222 100644
--- a/lisp/riece-display.el
+++ b/lisp/riece-display.el
@@ -161,7 +161,7 @@ This function is for internal use only."
      (setq riece-join-channel-candidate nil))
    (lambda (signal)
      (riece-identity-equal (car (riece-signal-args signal))
-			   riece-current-nickname)))
+			   (riece-current-nickname))))
   (riece-connect-signal
    'riece-naming-assert-part
    (lambda (signal handback)
@@ -179,7 +179,7 @@ This function is for internal use only."
      (riece-part-channel (nth 1 (riece-signal-args signal)))
    (lambda (signal)
      (riece-identity-equal (car (riece-signal-args signal))
-			   riece-current-nickname))))
+			   (riece-current-nickname)))))
   (riece-connect-signal
    'riece-naming-assert-rename
    (lambda (signal handback)
diff --git a/lisp/riece-handle.el b/lisp/riece-handle.el
index dd848a8..386e491 100644
--- a/lisp/riece-handle.el
+++ b/lisp/riece-handle.el
@@ -397,7 +397,8 @@
     (when (string-match "\\([^ ]+\\) *:?" string)
       (setq channel (match-string 1 string)
 	    string (substring string (match-end 0)))
-      (riece-parse-channel-modes string channel)
+      (if (string-match (concat "^" riece-channel-regexp "$") channel)
+        (riece-parse-channel-modes string channel))
       (let* ((channel-identity (riece-make-identity channel riece-server-name))
 	     (buffer (riece-channel-buffer channel-identity)))
 	(riece-insert-change