From: ueno <ueno>
Date: Sat, 27 Aug 2005 05:23:28 +0000 (+0000)
Subject: Fixed resolution of riece-addon-dependencies.
X-Git-Tag: channel-coding-branchpoint~29
X-Git-Url: http://git.chise.org/gitweb/?a=commitdiff_plain;h=d65f5d9e5021838f053c0491b685ba217af7a197;p=elisp%2Friece.git

Fixed resolution of riece-addon-dependencies.
---

diff --git a/lisp/riece-addon.el b/lisp/riece-addon.el
index a2a6bc3..b48582f 100644
--- a/lisp/riece-addon.el
+++ b/lisp/riece-addon.el
@@ -126,10 +126,13 @@
 	dependencies)
     (while addons
       (require (car addons))		;error will be reported here
-      (let* ((requires
-	      (funcall (or (intern-soft
-			    (concat (symbol-name (car addons)) "-requires"))
-			   #'ignore)))
+      (let* ((requires-function
+	      (intern-soft
+	       (concat (symbol-name (car addons)) "-requires")))
+	     (requires
+	      (if (and requires-function
+		       (fboundp requires-function))
+		  (funcall requires-function)))
 	     (pointer requires)
 	     entry)
 	;; Increment succs' pred count.
@@ -212,8 +215,9 @@
 (defun riece-insinuate-addon (addon &optional verbose)
   (unless (assq addon riece-addon-dependencies)
     (setq riece-addons (cons addon riece-addons)
-	  riece-addon-dependencies (riece-resolve-addons
-				    (copy-sequence riece-addons))))
+	  riece-addon-dependencies
+	  (riece-resolve-addons
+	   (cons addon (mapcar #'car riece-addon-dependencies)))))
   (let ((pointer riece-addon-dependencies))
     (while pointer
       (unless (get (car (car pointer)) 'riece-addon-insinuated)
@@ -227,7 +231,8 @@
       (if verbose
 	  (message "Add-on %S is not insinuated" addon))
     (let ((entry (assq addon riece-addon-dependencies))
-	  (enabled (intern-soft (concat (symbol-name addon) "-enabled"))))
+	  (enabled (intern-soft (concat (symbol-name addon) "-enabled")))
+	  (uninstall (intern-soft (concat (symbol-name addon) "-uninstall"))))
       (if entry
 	  (if (cdr entry)
 	      (if (= (length (cdr entry)) 1)
@@ -236,17 +241,19 @@
 		       (mapconcat #'symbol-name (cdr entry) ", ")
 		       addon))
 	    (if (and enabled
+		     (boundp enabled)
 		     (symbol-value enabled))
 		(riece-disable-addon addon verbose))
-	    (funcall (or (intern-soft (concat (symbol-name addon)
-					      "-uninstall"))
-			 #'ignore))
+	    (if (and uninstall
+		     (fboundp uninstall))
+		(funcall uninstall))
 	    (setq riece-addon-dependencies
 		  (delq entry riece-addon-dependencies))
 	    (remprop addon 'riece-addon-insinuated)
 	    (setq riece-addons (delq addon riece-addons)
-		  riece-addon-dependencies (riece-resolve-addons
-					    (copy-sequence riece-addons)))))
+		  riece-addon-dependencies
+		  (riece-resolve-addons
+		   (delq addon (mapcar #'car riece-addon-dependencies))))))
       (if verbose
 	  (message "Add-on %S is uninstalled" addon)))))
 
@@ -254,7 +261,8 @@
   (unless (get addon 'riece-addon-insinuated)
     (error "Add-on %S is not insinuated" addon))
   (let ((enabled (intern-soft (concat (symbol-name addon) "-enabled"))))
-    (if (null enabled)
+    (if (or (null enabled)
+	    (not (boundp enabled)))
 	(if verbose
 	    (message "Add-on %S doesn't support enable/disable" addon))
       (if (symbol-value enabled)
@@ -268,7 +276,8 @@
   (unless (get addon 'riece-addon-insinuated)
     (error "Add-on %S is not insinuated" addon))
   (let ((enabled (intern-soft (concat (symbol-name addon) "-enabled"))))
-    (if (null enabled)
+    (if (or (null enabled)
+	    (not (boundp enabled)))
 	(if verbose
 	    (message "Add-on %S doesn't support enable/disable" addon))
       (if (symbol-value enabled)
@@ -315,7 +324,8 @@ All normal editing commands are turned off."
 					     "-description"))
 	    module-description-alist
 	    (cons (cons (car (car pointer))
-			(if description
+			(if (and description
+				 (boundp description))
 			    (symbol-value description)
 			  "(no description)"))
 		  module-description-alist)