X-Git-Url: https://cgit.sxemacs.org/?p=riece;a=blobdiff_plain;f=lisp%2Friece-addon.el;h=092e6a50cbcdcea8ceea56dd1d28148a68dd948f;hp=3cfda0798d0bf0ce996eed784c7e3245d25029c6;hb=3f35b389dfd302ac32ed5151d08b7411df6b34bc;hpb=1d4697c406a4e90d97330d6d4f18a29541e97965 diff --git a/lisp/riece-addon.el b/lisp/riece-addon.el index 3cfda07..092e6a5 100644 --- a/lisp/riece-addon.el +++ b/lisp/riece-addon.el @@ -181,11 +181,15 @@ (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))))) + (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