From: ueno <ueno>
Date: Thu, 25 Aug 2005 08:03:33 +0000 (+0000)
Subject: * riece-addon.el (riece-command-list-addons): Use
X-Git-Tag: channel-coding-branchpoint~77
X-Git-Url: http://git.chise.org/gitweb/?a=commitdiff_plain;h=44da7c479d0a5c5a764371bb4b6f2e2a7ab2144e;p=elisp%2Friece.git

* riece-addon.el (riece-command-list-addons): Use
riece-addon-dependencies instead of riece-addons.
(riece-command-enable-addon): Ditto.
(riece-command-disable-addon): Ditto.
---

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 28c6768..08cc76d 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,5 +1,12 @@
 2005-08-25  Daiki Ueno  <ueno@unixuser.org>
 
+	* riece-addon.el (riece-command-list-addons): Use
+	riece-addon-dependencies instead of riece-addons.
+	(riece-command-enable-addon): Ditto.
+	(riece-command-disable-addon): Ditto.
+
+2005-08-25  Daiki Ueno  <ueno@unixuser.org>
+
 	* riece.el (riece): Don't override riece-addons setting.
 
 	* riece-globals.el (riece-addon-dependencies): New variable.
diff --git a/lisp/riece-addon.el b/lisp/riece-addon.el
index 7181353..c1280ef 100644
--- a/lisp/riece-addon.el
+++ b/lisp/riece-addon.el
@@ -255,32 +255,32 @@ All normal editing commands are turned off."
   (riece-addon-list-mode)
   (let ((inhibit-read-only t)
 	buffer-read-only
-	(pointer (sort (copy-sequence riece-addons)
-		       (lambda (symbol1 symbol2)
-				  (string-lessp (symbol-name symbol1)
-						(symbol-name symbol2)))))
+	(pointer (sort (copy-sequence riece-addon-dependencies)
+		       (lambda (dependency1 dependency2)
+			 (string-lessp (symbol-name (car dependency1))
+				       (symbol-name (car dependency2))))))
 	enabled description point)
     (erase-buffer)
     (riece-kill-all-overlays)
     (while pointer
-      (setq enabled (intern-soft (concat (symbol-name (car pointer))
+      (setq enabled (intern-soft (concat (symbol-name (car (car pointer)))
 					 "-enabled"))
-	    description (intern-soft (concat (symbol-name (car pointer))
+	    description (intern-soft (concat (symbol-name (car (car pointer)))
 					     "-description")))
       (setq point (point))
       (insert (format "%c %S: %s\n"
-		      (if (not (featurep (car pointer)))
+		      (if (not (featurep (car (car pointer))))
 			  ??
 			(if (null enabled)
 			    ?!
 			  (if (symbol-value enabled)
 			      ?+
 			    ?-)))
-		      (car pointer)
+		      (car (car pointer))
 		      (if description
 			  (symbol-value description)
 			"(no description)")))
-      (put-text-property point (point) 'riece-addon (car pointer))
+      (put-text-property point (point) 'riece-addon (car (car pointer)))
       (setq pointer (cdr pointer)))
     (insert "
 Symbols in the leftmost column:
@@ -307,9 +307,9 @@ Useful keys:
 	    (get-text-property (point) 'riece-addon))
 	(intern-soft
 	 (completing-read "Add-on: "
-			  (mapcar (lambda (addon)
-				    (list (symbol-name addon)))
-				  riece-addons)
+			  (mapcar (lambda (dependency)
+				    (list (symbol-name (car dependency))))
+				  riece-addon-dependencies)
 			  (lambda (pointer)
 			    (let ((enabled
 				   (intern-soft (concat (car pointer)
@@ -334,9 +334,9 @@ Useful keys:
 	    (get-text-property (point) 'riece-addon))
 	(intern-soft
 	 (completing-read "Add-on: "
-			  (mapcar (lambda (addon)
-				    (list (symbol-name addon)))
-				  riece-addons)
+			  (mapcar (lambda (dependency)
+				    (list (symbol-name (car dependency))))
+				  riece-addon-dependencies)
 			  (lambda (pointer)
 			    (let ((enabled
 				   (intern-soft (concat (car pointer)