* riece-handle.el (riece-handle-privmsg-message): Check own

[riece] / lisp / riece-history.el

diff --git a/lisp/riece-history.el b/lisp/riece-history.el
index e49b356..aece829 100644 (file)
--- a/lisp/riece-history.el
+++ b/lisp/riece-history.el
@@ -31,6 +31,10 @@
 
 ;;; Code:
 
+(require 'riece-options)
+(require 'riece-globals)
+(require 'riece-highlight)
+(require 'riece-identity)
 (require 'ring)
 
 (defgroup riece-history nil
@@ -89,8 +93,9 @@
              (setq riece-channel-history nil)))
   (add-hook 'riece-after-switch-to-channel-functions
            (lambda (last)
-             (unless (riece-identity-equal last riece-current-channel)
-               (ring-insert riece-channel-history last))))
+             (if (and last
+                      (not (riece-identity-equal last riece-current-channel)))
+                 (ring-insert riece-channel-history last))))
   (add-hook 'riece-format-channel-list-line-functions
            'riece-history-format-channel-list-line)
   (if (memq 'riece-highlight riece-addons)