* 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 334ef80..4901fdf 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,8 @@
+2003-04-28  TAKAHASHI Kaoru  <kaoru@kaisei.org>
+
+        * liece-handle.el (liece-handle-privmsg-message): Don't compare when
+        `item' and `liece-current-chat-partner' are nil.
+
 2002-10-15  Daiki Ueno  <ueno@unixuser.org>
 
        * liece-emacs.el: Don't use insert-file-contents-as-binary to read

diff --git a/lisp/liece-handle.el b/lisp/liece-handle.el
index d5e2b67..c0670c2 100644 (file)
--- 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))))