X-Git-Url: http://cgit.sxemacs.org/?p=riece;a=blobdiff_plain;f=lisp%2Friece-mini.el;h=fcadb6b56c2a86256972057c82845fe37ecd202e;hp=1b23e6ad8a663e226f36c1e13f89271c8db4ff97;hb=29f64e9d1164d24f6657e79f35efdb18fc04b4c0;hpb=028db0ba3a8afe412aca6e282992a59aff210a80

diff --git a/lisp/riece-mini.el b/lisp/riece-mini.el
index 1b23e6a..fcadb6b 100644
--- a/lisp/riece-mini.el
+++ b/lisp/riece-mini.el
@@ -41,9 +41,10 @@
 ;;; Code:
 
 (require 'riece-message)
+(require 'riece-biff)
 
 (defgroup riece-mini nil
-  "riece on minibuffer"
+  "Riece on minibuffer."
   :group 'riece)
 
 (defcustom riece-mini-backlog-size 5
@@ -60,14 +61,14 @@
 (defconst riece-mini-description
   "Send arrival messages to minibuffer")
 
-(defmacro riece-mini-message-no-log (string &rest args)
+(defun riece-mini-message-no-log (string &rest args)
   "Like `message', except that message logging is disabled."
   (if (featurep 'xemacs)
       (if args
-	  `(display-message 'no-log (format ,string ,@args))
-	`(display-message 'no-log ,string))
-    `(let (message-log-max)
-       (message ,string ,@args))))
+	  (display-message 'no-log (apply #'format string args))
+	(display-message 'no-log string))
+    (let (message-log-max)
+      (apply #'message string args))))
 
 (defun riece-mini-display-message-function (message)
   "Show arrival messages to 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)