X-Git-Url: https://cgit.sxemacs.org/?p=riece;a=blobdiff_plain;f=lisp%2Friece-channel.el;h=da4b75db88f71f65a92bd528185e20f31240f5be;hp=86ed2ac1e3a22334a14edd03fec9ca62fb3ddb00;hb=8809287221a53d492069eb7a9772d38b8a6f10a3;hpb=387fef96e9a1bb38b25c7e398b4a17bb9d931488

diff --git a/lisp/riece-channel.el b/lisp/riece-channel.el
index 86ed2ac..da4b75d 100644
--- a/lisp/riece-channel.el
+++ b/lisp/riece-channel.el
@@ -27,6 +27,7 @@
 (require 'riece-options)
 (require 'riece-globals)
 (require 'riece-identity)
+(require 'riece-mode)
 
 ;;; Channel object:
 (defun riece-find-channel (name)
@@ -147,12 +148,13 @@ respectively."
 (defun riece-channel-toggle-mode (name mode flag)
   "Add or remove channel MODE of channel."
   (let* ((channel (riece-get-channel name))
-	 (modes (riece-channel-modes channel)))
+	 (modes (riece-channel-modes channel))
+	 (old (riece-mode-assoc (riece-mode-flag mode) modes)))
     (if flag
-	(unless (memq mode modes)
+	(unless old
 	  (riece-channel-set-modes channel (cons mode modes)))
-      (if (memq mode modes)
-	  (riece-channel-set-modes channel (delq mode modes))))))
+      (if old
+	  (riece-channel-set-modes channel (delq old modes))))))
 
 (defun riece-channel-toggle-banned (name pattern flag)
   "Add or remove banned PATTERN of channel."
@@ -192,7 +194,7 @@ respectively."
     (if flag
 	(unless (riece-identity-assoc user users t)
 	  (riece-channel-set-users channel (cons (list user) users)))
-      (if (setq user (car (riece-identity-assoc user users t)))
+      (if (setq user (riece-identity-assoc user users t))
 	  (riece-channel-set-users channel (delq user users))))))
 
 (defun riece-channel-toggle-operator (name user flag)