* riece-addon.el (riece-addon-list-mode-map): Bind

[riece] / lisp / riece-history.el

diff --git a/lisp/riece-history.el b/lisp/riece-history.el
index ae7b667..64ed6b9 100644 (file)
--- a/lisp/riece-history.el
+++ b/lisp/riece-history.el
@@ -1,4 +1,4 @@
-;;; riece-history.el --- channel history management add-on
+;;; riece-history.el --- manage history of channel shifting
 ;; Copyright (C) 1998-2003 Daiki Ueno
 
 ;; Author: Daiki Ueno <ueno@unixuser.org>
@@ -23,6 +23,8 @@
 
 ;;; Commentary:
 
+;; NOTE: This is an add-on module for Riece.
+
 ;; You can check recently visited channels via `C-c g' in the commands
 ;; buffer, by adding the following lines to ~/.riece/init.el:
 
@@ -39,7 +41,7 @@
 (require 'ring)
 
 (defgroup riece-history nil
-  "Channel history"
+  "Manage history of channel shifting."
   :tag "History"
   :prefix "riece-"
   :group 'riece)
@@ -62,12 +64,22 @@
   :group 'riece-highlight-faces)
 (defvar riece-channel-list-history-face 'riece-channel-list-history-face)
 
+(unless (riece-facep 'riece-modeline-history-face)
+  (make-face 'riece-modeline-history-face
+            "Face used for displaying history channels in modeline.")
+  (if (featurep 'xemacs)
+      (set-face-parent 'riece-modeline-history-face 'modeline))
+  (set-face-foreground 'riece-modeline-history-face
+                      (face-foreground 'riece-channel-list-history-face)))
+
+(defvar riece-modeline-history-face 'riece-modeline-history-face)
+
 (defvar riece-channel-history nil)
 
 (defvar riece-history-enabled nil)
 
 (defconst riece-history-description
-  "Keep track channel history")
+  "Manage history of channel shifting.")
 
 (defun riece-guess-channel-from-history ()
   (let ((length (ring-length riece-channel-history))
@@ -98,18 +110,20 @@
                string (replace-match "%%" nil nil string)))
        (list (format "%d:" index)
              (riece-propertize-modeline-string
-              string 'face 'riece-channel-list-history-face)))))
+              string 'face 'riece-modeline-history-face)))))
 
 ;;; (defun riece-history-requires ()
 ;;;   (if (memq 'riece-guess riece-addons)
 ;;;       '(riece-guess)))
 
+(defun riece-history-after-switch-to-channel-functions (last)
+  (if (and riece-history-enabled last
+          (not (riece-identity-equal last riece-current-channel)))
+      (ring-insert riece-channel-history last)))
+
 (defun riece-history-insinuate ()
   (add-hook 'riece-after-switch-to-channel-functions
-           (lambda (last)
-             (if (and riece-history-enabled last
-                      (not (riece-identity-equal last riece-current-channel)))
-                 (ring-insert riece-channel-history last))))
+           'riece-history-after-switch-to-channel-functions)
   (add-hook 'riece-format-identity-for-channel-list-buffer-functions
            'riece-history-format-identity-for-channel-list-buffer)
   (add-hook 'riece-format-identity-for-channel-list-indicator-functions
@@ -123,6 +137,17 @@
 ;;;            'riece-guess-channel-from-history))
   )
 
+(defun riece-history-uninstall ()
+  (remove-hook 'riece-after-switch-to-channel-functions
+              'riece-history-after-switch-to-channel-functions)
+  (remove-hook 'riece-format-identity-for-channel-list-buffer-functions
+              'riece-history-format-identity-for-channel-list-buffer)
+  (remove-hook 'riece-format-identity-for-channel-list-indicator-functions
+              'riece-history-format-identity-for-channel-list-indicator)
+  (setq riece-channel-list-mark-face-alist
+       (delq (assq ?+ riece-channel-list-mark-face-alist)
+             riece-channel-list-mark-face-alist)))
+
 (defun riece-history-enable ()
   (setq riece-channel-history
        (make-ring riece-channel-history-length))