Handle non-string/symbol langs in babel lazy loader

Possibly addresses #1745
This commit is contained in:
Henrik Lissner 2019-09-08 20:55:21 -04:00
parent a44e9153d3
commit a3a73bd316
No known key found for this signature in database
GPG key ID: 5F6C0EA160557395

View file

@ -136,10 +136,12 @@ at the first function to return non-nil.")
"Load babel libraries lazily when babel blocks are executed." "Load babel libraries lazily when babel blocks are executed."
:after-while #'org-babel-confirm-evaluate :after-while #'org-babel-confirm-evaluate
(let* ((lang (nth 0 info)) (let* ((lang (nth 0 info))
(lang (if (symbolp lang) lang (intern lang))) (lang (cond ((symbolp lang) lang)
((stringp lang) (intern lang))))
(lang (or (cdr (assq lang +org-babel-mode-alist)) (lang (or (cdr (assq lang +org-babel-mode-alist))
lang))) lang)))
(when (and (not (cdr (assq lang org-babel-load-languages))) (when (and lang
(not (cdr (assq lang org-babel-load-languages)))
(or (run-hook-with-args-until-success '+org-babel-load-functions lang) (or (run-hook-with-args-until-success '+org-babel-load-functions lang)
(require (intern (format "ob-%s" lang)) nil t))) (require (intern (format "ob-%s" lang)) nil t)))
(when (assq :async (nth 2 info)) (when (assq :async (nth 2 info))