From 2222e5a2493005ffe4d044500885e95f53b56ff6 Mon Sep 17 00:00:00 2001 From: Bastien Guerry Date: Mon, 3 Mar 2008 10:31:45 +0000 Subject: [PATCH] Fix `org-load-default-extensions': don't throw an error. --- ChangeLog | 3 +++ org.el | 7 +++++-- 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/ChangeLog b/ChangeLog index 71d8b6890..e6625b56d 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,5 +1,8 @@ 2008-03-03 Bastien Guerry + * org.el (org-load-default-extensions): Don't throw an error when + a feature cannot be loaded, send a message instead. + * org-publish.el (org-publish-org-to, org-publish-org-to-latex) (org-publish-org-to-html): New argument `pub-dir' for temporary publication directory. diff --git a/org.el b/org.el index 4c9663d6a..af6632dcf 100644 --- a/org.el +++ b/org.el @@ -172,8 +172,11 @@ will be autoloaded when needed, preloading is not necessary." (const :tag " Apple Mail message links under OS X (org-mac-message.el)" org-mac-message))) (defun org-load-default-extensions () - "Load all extensions that are listed in `org-default-extensions'." - (mapc 'require org-default-extensions)) + "Load all extensions listed in `org-default-extensions'." + (mapc (lambda (ext) + (condition-case nil (require ext) + (error (message "Feature `%s' is not known" ext)))) + org-default-extensions)) ;; FIXME: Needs a separate group... (defcustom org-completion-fallback-command 'hippie-expand