* riece-addon.el (riece-resolve-addons): Fixed

[riece] / lisp / riece-addon.el

diff --git a/lisp/riece-addon.el b/lisp/riece-addon.el
index f389349..092e6a5 100644 (file)
--- a/lisp/riece-addon.el
+++ b/lisp/riece-addon.el
@@ -179,13 +179,17 @@
        (error "Circular add-on dependency found"))
     (nreverse addons)))
 
-(defun riece-resolve-addon (addons)
+(defun riece-resolve-addons (addons)
   (riece-resolve-addon-dependencies
-   (append addons
-          (mapcar
-           (lambda (name)
-             (intern (file-name-sans-extension name)))
-           (directory-files riece-addon-directory nil "\\`[^.]" t t)))))
+   (if (file-directory-p riece-addon-directory)
+       (append addons
+              (mapcar
+               (lambda (name)
+                 (unless (file-directory-p
+                          (expand-file-name name riece-addon-directory))
+                   (intern (file-name-sans-extension name))))
+               (directory-files riece-addon-directory nil "\\`[^.]" t)))
+     addons)))
 
 (defun riece-insinuate-addon (addon &optional verbose)
   (require addon)              ;implicit dependency