X-Git-Url: http://git.chise.org/gitweb/?a=blobdiff_plain;f=lisp%2Friece-display.el;h=bb490092a9df117960082350d4135ed824677a9a;hb=6d41b61916f102a2972cc2fb71862926e0092845;hp=e72fe27cc84c7c2fca0469e3378769e676aeb186;hpb=4a30d54b4a864b0e9e6aa3a45dcd5d738e0861e6;p=elisp%2Friece.git

diff --git a/lisp/riece-display.el b/lisp/riece-display.el
index e72fe27..bb49009 100644
--- a/lisp/riece-display.el
+++ b/lisp/riece-display.el
@@ -29,6 +29,8 @@
 (require 'riece-misc)
 (require 'riece-layout)
 
+(autoload 'ring-insert "ring")
+
 (defvar riece-update-buffer-functions
   '(riece-update-user-list-buffer
     riece-update-channel-list-buffer
@@ -180,8 +182,8 @@
     (current-buffer)))
 
 (defun riece-switch-to-channel (identity)
-  (setq riece-last-channel riece-current-channel
-	riece-current-channel identity)
+  (ring-insert riece-channel-history riece-current-channel)
+  (setq riece-current-channel identity)
   (run-hooks 'riece-channel-switch-hook))
 
 (defun riece-join-channel (identity)
@@ -211,8 +213,8 @@
       (setq identity (car pointer)))
     (if identity
 	(riece-switch-to-channel identity)
-      (setq riece-last-channel riece-current-channel
-	    riece-current-channel nil))))
+      (ring-insert riece-channel-history riece-current-channel)
+      (setq riece-current-channel nil))))
 
 (defun riece-part-channel (identity)
   (let ((pointer (riece-identity-member identity riece-current-channels)))