diff options
| author | Eric Schulte <schulte.eric@gmail.com> | 2010-07-16 10:53:36 -0700 |
|---|---|---|
| committer | Eric Schulte <schulte.eric@gmail.com> | 2010-07-16 10:53:36 -0700 |
| commit | 851611291ce600926bb2a3fb52b77ba6bf6de341 (patch) | |
| tree | 5048626331734a96fa0825c200aa012b9c3b3312 | |
| parent | 619b8591fccf87695a2f174da23c57655d866460 (diff) | |
| download | org-mode-851611291ce600926bb2a3fb52b77ba6bf6de341.tar.gz | |
org-reload doesn't load language files not in org-babel-load-langs
* lisp/org.el (org-reload): ensure that org-reload doesn't load
language files that are not part of org-babel-load-langs
| -rw-r--r-- | lisp/org.el | 12 |
1 files changed, 11 insertions, 1 deletions
diff --git a/lisp/org.el b/lisp/org.el index 779b2d5..e26c51b 100644 --- a/lisp/org.el +++ b/lisp/org.el @@ -17704,13 +17704,23 @@ Your bug report will be posted to the Org-mode mailing list. With prefix arg UNCOMPILED, load the uncompiled versions." (interactive "P") (require 'find-func) - (let* ((file-re "^\\(ob\\|org\\|orgtbl\\)\\(\\.el\\|-.*\\.el\\)") + (let* ((file-re "^\\(org\\|orgtbl\\)\\(\\.el\\|-.*\\.el\\)") (dir-org (file-name-directory (org-find-library-name "org"))) (dir-org-contrib (ignore-errors (file-name-directory (org-find-library-name "org-contribdir")))) + (babel-files + (mapcar (lambda (el) (concat "ob" (when el (format "-%s" el)) ".el")) + (append (list nil "comint" "eval" "exp" "keys" + "lob" "ref" "table" "tangle") + (delq nil + (mapcar + (lambda (lang) + (when (cdr lang) (symbol-name (car lang)))) + org-babel-load-languages))))) (files (append (directory-files dir-org t file-re) + babel-files (and dir-org-contrib (directory-files dir-org-contrib t file-re)))) (remove-re (concat (if (featurep 'xemacs) |