* riece-log.el (riece-log-flashback): Run riece-button-update-buffer

only when riece-button is enabled.

* riece-mini.el: Require 'riece-biff.
(riece-mini-requires): New function.
(riece-mini-show-backlog): Run riece-biff-clear when riece-biff is
enabled.

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 8d13c22..260193b 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,13 @@
+2004-09-14  OHASHI Akira  <bg66@koka-in.org>
+
+       * riece-log.el (riece-log-flashback): Run riece-button-update-buffer
+       only when riece-button is enabled.
+
+       * riece-mini.el: Require 'riece-biff.
+       (riece-mini-requires): New function.
+       (riece-mini-show-backlog): Run riece-biff-clear when riece-biff is
+       enabled.
+
 2004-09-13  OHASHI Akira  <bg66@koka-in.org>
 
        * riece-mini.el (riece-mini-show-backlog): Fix for long messages.

diff --git a/lisp/riece-log.el b/lisp/riece-log.el
index bf34782..352fa03 100644 (file)
--- a/lisp/riece-log.el
+++ b/lisp/riece-log.el
@@ -127,8 +127,9 @@ If integer, flash back only this line numbers. t means all lines."
                                 (riece-make-identity
                                  (riece-match-string-no-properties 1)
                                  (riece-identity-server identity))))
-           (if (memq 'riece-button riece-addons)
-               (riece-button-update-buffer))
+           (when (and (memq 'riece-button riece-addons)
+                      riece-button-enabled)
+             (riece-button-update-buffer))
            (goto-char (point-max))
            (set-window-point (get-buffer-window (current-buffer))
                              (point))))))))

diff --git a/lisp/riece-mini.el b/lisp/riece-mini.el
index 1b23e6a..2c88006 100644 (file)
--- a/lisp/riece-mini.el
+++ b/lisp/riece-mini.el
@@ -41,6 +41,7 @@
 ;;; Code:
 
 (require 'riece-message)
+(require 'riece-biff)
 
 (defgroup riece-mini nil
   "riece on minibuffer"
@@ -126,6 +127,9 @@ If twice (C-u C-u), then ask the channel."
       (let ((max-mini-window-height height)
            (resize-mini-windows t))
        (setq riece-mini-backlog-shown t)
+       (when (and (memq 'riece-biff riece-addons)
+                  riece-biff-enabled)
+         (riece-biff-clear))
        (riece-mini-message-no-log
         "%s" (mapconcat #'identity riece-mini-backlog-history "\n"))))))
 
@@ -135,6 +139,10 @@ If twice (C-u C-u), then ask the channel."
       (setq riece-mini-backlog-shown nil)
       (riece-mini-message-no-log ""))))
 
+(defun riece-mini-requires ()
+  (if (memq 'riece-biff riece-addons)
+ '(riece-biff)))
+
 (defun riece-mini-insinuate ()
   (add-hook 'riece-after-display-message-functions
            'riece-mini-display-message-function)