From: ueno <ueno>
Date: Sat, 27 Aug 2005 04:22:40 +0000 (+0000)
Subject: * riece-history.el (riece-history-requires): New function.
X-Git-Tag: channel-coding-branchpoint~33
X-Git-Url: http://git.chise.org/gitweb/?a=commitdiff_plain;h=7208be4d0c0b6777ace3c3ca11691858ab76a0d4;p=elisp%2Friece.git

* riece-history.el (riece-history-requires): New function.
* riece-addon.el (riece-insinuate-addon-1): Require add-on feature.
---

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 8d158db..f270506 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,5 +1,10 @@
 2005-08-27  Daiki Ueno  <ueno@unixuser.org>
 
+	* riece-history.el (riece-history-requires): New function.
+	* riece-addon.el (riece-insinuate-addon-1): Require add-on feature.
+
+2005-08-27  Daiki Ueno  <ueno@unixuser.org>
+
 	* riece-foolproof.el (riece-foolproof-description): Made it more
 	descriptive.
 
diff --git a/lisp/riece-addon.el b/lisp/riece-addon.el
index e2a6f21..a2a6bc3 100644
--- a/lisp/riece-addon.el
+++ b/lisp/riece-addon.el
@@ -201,6 +201,7 @@
   (if (get addon 'riece-addon-insinuated)
       (if verbose
 	  (message "Add-on %S is already insinuated" addon))
+    (require addon)
     (funcall (intern (concat (symbol-name addon) "-insinuate")))
     (put addon 'riece-addon-insinuated t)
     (if verbose
@@ -310,7 +311,6 @@ All normal editing commands are turned off."
 	module-description-alist
 	description enabled point)
     (while pointer
-      
       (setq description (intern-soft (concat (symbol-name (car (car pointer)))
 					     "-description"))
 	    module-description-alist
diff --git a/lisp/riece-history.el b/lisp/riece-history.el
index 64ed6b9..ed3a057 100644
--- a/lisp/riece-history.el
+++ b/lisp/riece-history.el
@@ -35,10 +35,10 @@
 
 (require 'riece-options)
 (require 'riece-globals)
-(require 'riece-highlight)
 (require 'riece-identity)
 (require 'riece-signal)
 (require 'ring)
+(eval-when-compile (require 'riece-highlight))
 
 (defgroup riece-history nil
   "Manage history of channel shifting."
@@ -121,6 +121,10 @@
 	   (not (riece-identity-equal last riece-current-channel)))
       (ring-insert riece-channel-history last)))
 
+(defun riece-history-requires ()
+  (if (memq 'riece-highlight riece-addons)
+      '(riece-highlight)))
+
 (defun riece-history-insinuate ()
   (add-hook 'riece-after-switch-to-channel-functions
 	    'riece-history-after-switch-to-channel-functions)
diff --git a/lisp/riece-xface.el b/lisp/riece-xface.el
index 30f7bb4..b94b006 100644
--- a/lisp/riece-xface.el
+++ b/lisp/riece-xface.el
@@ -31,7 +31,7 @@
 (require 'riece-identity)
 (require 'riece-globals)
 (require 'riece-display)
-(require 'riece-lsdb)
+(eval-when-compile (require 'riece-lsdb))
 
 (defvar riece-xface-enabled nil)