X-Git-Url: https://cgit.sxemacs.org/?p=riece;a=blobdiff_plain;f=lisp%2Friece-message.el;h=81d430cf8c09070411f6de4b089e94e5258e313e;hp=f9d3740f9cf94a5673de1fbf835f73c6a2785d8e;hb=465b68048344cb9660459ea4a64abc1a2591c094;hpb=70f7f82c08b9bb70c14b506354db416cf569c8ca

diff --git a/lisp/riece-message.el b/lisp/riece-message.el
index f9d3740..81d430c 100644
--- a/lisp/riece-message.el
+++ b/lisp/riece-message.el
@@ -30,7 +30,7 @@
 (require 'riece-misc)
 
 (defgroup riece-message nil
-  "Messages"
+  "Display messages."
   :tag "Message"
   :prefix "riece-"
   :group 'riece)
@@ -114,7 +114,7 @@
 		  (riece-message-target message))))
     (unless (riece-identity-member target riece-current-channels)
       (riece-join-channel target)
-      ;; If you are not joined any channel,
+      ;; If you are not joined to any channel,
       ;; switch to the target immediately.
       (unless riece-current-channel
 	(riece-switch-to-channel target)))
@@ -174,13 +174,14 @@ Normally they are *Dialogue* and/or *Others*."
     (setq parent-buffers (riece-message-parent-buffers message buffer))
     (riece-insert buffer (riece-format-message message))
     (riece-insert parent-buffers (riece-format-message message t))
-    (run-hook-with-args 'riece-after-display-message-functions message)))
+    (with-current-buffer buffer
+      (run-hook-with-args 'riece-after-display-message-functions message))))
 
 (defun riece-display-message (message)
   "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