* riece-message.el (riece-display-message-1): Call

[riece] / lisp / riece-log.el

diff --git a/lisp/riece-log.el b/lisp/riece-log.el
index 744e367..352fa03 100644 (file)
--- a/lisp/riece-log.el
+++ b/lisp/riece-log.el
@@ -30,8 +30,8 @@
 
 ;;; Code:
 
-(eval-when-compile (require 'riece-message)
-                  (require 'riece-button))
+(require 'riece-message)
+(require 'riece-button)
 
 (defgroup riece-log nil
   "Save irc log"
@@ -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))))))))