From 65416a30b7db69b2e55ea1363b035e6d15d96eca Mon Sep 17 00:00:00 2001 From: ueno Date: Thu, 3 Feb 2005 03:17:22 +0000 Subject: [PATCH] * riece-addon.el (riece-resolve-addon-dependencies): Rename from riece-resolve-addon. (riece-resolve-addon): Append add-ons under riece-addon-directory. --- lisp/ChangeLog | 6 ++++++ lisp/riece-addon.el | 10 +++++++++- 2 files changed, 15 insertions(+), 1 deletion(-) diff --git a/lisp/ChangeLog b/lisp/ChangeLog index fa18dc7..92dd125 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog @@ -1,3 +1,9 @@ +2005-02-03 Daiki Ueno + + * riece-addon.el (riece-resolve-addon-dependencies): Rename from + riece-resolve-addon. + (riece-resolve-addon): Append add-ons under riece-addon-directory. + 2005-02-02 TAKAHASHI Kaoru * riece-message.el (riece-display-message): When filter-function diff --git a/lisp/riece-addon.el b/lisp/riece-addon.el index 5861006..f389349 100644 --- a/lisp/riece-addon.el +++ b/lisp/riece-addon.el @@ -144,7 +144,7 @@ (setq addons (cdr addons))) dependencies)) -(defun riece-resolve-addons (addons) +(defun riece-resolve-addon-dependencies (addons) (let ((pointer addons) dependencies queue) ;; Uniquify, first. @@ -179,6 +179,14 @@ (error "Circular add-on dependency found")) (nreverse addons))) +(defun riece-resolve-addon (addons) + (riece-resolve-addon-dependencies + (append addons + (mapcar + (lambda (name) + (intern (file-name-sans-extension name))) + (directory-files riece-addon-directory nil "\\`[^.]" t t))))) + (defun riece-insinuate-addon (addon &optional verbose) (require addon) ;implicit dependency (funcall (intern (concat (symbol-name addon) "-insinuate"))) -- 1.7.10.4