* riece-message.el (riece-display-message): When filter-function

return nil, escape from while loop.

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 5e88cc8..fa18dc7 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,8 @@
+2005-02-02  TAKAHASHI Kaoru  <kaoru@kaisei.org>
+
+       * riece-message.el (riece-display-message): When filter-function
+       return nil, escape from while loop.
+
 2005-02-02  Daiki Ueno  <ueno@unixuser.org>
 
        * riece-debug.el (riece-debug-standard-output-buffer): Use

diff --git a/lisp/riece-message.el b/lisp/riece-message.el
index 033c319..c943e50 100644 (file)
--- a/lisp/riece-message.el
+++ b/lisp/riece-message.el
@@ -181,7 +181,7 @@ Normally they are *Dialogue* and/or *Others*."
   "Display MESSAGE object."
   (let ((functions riece-message-filter-functions))
     (setq message (copy-sequence message))
-    (while functions
+    (while (and functions message)
       (setq message (funcall (car functions) message)
            functions (cdr functions)))
     (if message