X-Git-Url: http://git.chise.org/gitweb/?a=blobdiff_plain;f=lisp%2Friece-message.el;h=e32c45f28fbf8347864dd8fcc88fe946591ee749;hb=1b05adabb6572578431ee2b740f08fbb96c323bf;hp=033c3193bdf4ed5274e82c63763ec767d0c46d52;hpb=c8a935336ce3152242651cfca2a0cecfe036c276;p=elisp%2Friece.git

diff --git a/lisp/riece-message.el b/lisp/riece-message.el
index 033c319..e32c45f 100644
--- a/lisp/riece-message.el
+++ b/lisp/riece-message.el
@@ -18,8 +18,8 @@
 
 ;; You should have received a copy of the GNU General Public License
 ;; along with GNU Emacs; see the file COPYING.  If not, write to the
-;; Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-;; Boston, MA 02111-1307, USA.
+;; Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+;; Boston, MA 02110-1301, USA.
 
 ;;; Code:
 
@@ -30,7 +30,7 @@
 (require 'riece-misc)
 
 (defgroup riece-message nil
-  "Messages"
+  "Display messages."
   :tag "Message"
   :prefix "riece-"
   :group 'riece)
@@ -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