X-Git-Url: https://cgit.sxemacs.org/?a=blobdiff_plain;f=lisp%2Friece-history.el;h=aece8294c803697ade61aa19a3477ca08ace6d07;hb=10b03ff38136cb918d21974dc049b22602f09a58;hp=e49b356a1b21e9e7c856f6362b8ab9511482a105;hpb=c694c12685b03816d35bc0a35b0202ddaeb56118;p=riece

diff --git a/lisp/riece-history.el b/lisp/riece-history.el
index e49b356..aece829 100644
--- 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)