From 9b6f7783d065a2d76d88678b6831e02f46e4160a Mon Sep 17 00:00:00 2001 From: kaoru Date: Mon, 28 Apr 2003 16:45:22 +0000 Subject: [PATCH] * liece-handle.el (liece-handle-privmsg-message): Don't compare when `item' and `liece-current-chat-partner' are nil --- lisp/ChangeLog | 5 +++++ lisp/liece-handle.el | 7 +++++-- 2 files changed, 10 insertions(+), 2 deletions(-) diff --git a/lisp/ChangeLog b/lisp/ChangeLog index 334ef80..4901fdf 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog @@ -1,3 +1,8 @@ +2003-04-28 TAKAHASHI Kaoru + + * liece-handle.el (liece-handle-privmsg-message): Don't compare when + `item' and `liece-current-chat-partner' are nil. + 2002-10-15 Daiki Ueno * 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 --- 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)))) -- 1.7.10.4