From: bg66 <bg66>
Date: Sat, 9 Jun 2001 10:50:38 +0000 (+0000)
Subject: * liece-handle.el (liece-handle-privmsg-message): Don't compare when
X-Git-Tag: liece-2_0_0-pre1~17
X-Git-Url: http://git.chise.org/gitweb/?a=commitdiff_plain;h=0f114379e121fb65b91c8764c1d6cb7f5fb802c6;p=elisp%2Fliece.git

* liece-handle.el (liece-handle-privmsg-message): Don't compare when
`item' and `liece-current-chat-partner' are nil.
---

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 41f7bf0..77137ea 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,8 @@
+2001-06-09  OHASHI Akira  <bg66@koka-in.org>
+
+	* liece-handle.el (liece-handle-privmsg-message): Don't compare when
+	`item' and `liece-current-chat-partner' are nil.
+
 2000-10-12   Akira Ohashi  <bg66@luck.gr.jp>
 
 	* liece-menu.el (liece-menu-ctcp-menu): Follow the CTCP command
diff --git a/lisp/liece-handle.el b/lisp/liece-handle.el
index c47fbf8..739168c 100644
--- a/lisp/liece-handle.el
+++ b/lisp/liece-handle.el
@@ -177,7 +177,7 @@
     (let ((item (if (eq liece-command-buffer-mode 'chat)
 		    liece-current-chat-partner
 		  liece-current-channel)))
-      (unless (liece-channel-equal chnl item)
+      (unless (and item (liece-channel-equal chnl item))
 	(if (liece-channel-unread-p chnl)
 	    (setq liece-channel-unread-list
 		  (delete chnl liece-channel-unread-list)))
@@ -186,7 +186,10 @@
       (run-hook-with-args 'liece-channel-unread-functions chnl)))
 
     (if (and (liece-nick-equal chnl liece-real-nickname)
-	     (not (liece-nick-equal prefix liece-current-chat-partner)))
+	     (if (and liece-current-chat-partner
+		      (eq liece-command-buffer-mode 'chat))
+		 (not (liece-nick-equal prefix liece-current-chat-partner))
+	       t))
 	(liece-message (_ "A private message has arrived from %s")
 		       prefix))))