emenel/doomemacs
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Fix wrong-type-arg error from #+call() in org-mode #634

Browse source 
By rewriting the org babel library lazy-loader.
This commit is contained in:
Henrik Lissner 2018-05-31 17:25:59 +02:00
parent a4d03654bd
commit 5c8ff3ada3
No known key found for this signature in database
GPG key ID: 5F6C0EA160557395
1 changed files with 22 additions and 21 deletions
Download patch file Download diff file Expand all files Collapse all files

37
modules/lang/org/+babel.el
View file

@ -3,12 +3,12 @@
(add-hook 'org-load-hook #'+org|init-babel) (add-hook 'org-load-hook #'+org|init-babel)
(defvar +org-babel-mode-alist (defvar +org-babel-mode-alist
'(("cpp" . C) '((cpp . C)
("C++" . C) (C++ . C)
("D" . C) (D . C)
("sh" . shell) (sh . shell)
("bash" . shell) (bash . shell)
("matlab" . octave)) (matlab . octave))
"An alist that maps languages to babel libraries. This is necessary for babel "An alist that maps languages to babel libraries. This is necessary for babel
libraries (ob-*.el) that don't match the name of the language.") libraries (ob-*.el) that don't match the name of the language.")
@ -24,20 +24,21 @@ string). Stops at the first function to return non-nil.")
org-src-window-setup 'current-window org-src-window-setup 'current-window
org-confirm-babel-evaluate nil) ; you don't need my permission org-confirm-babel-evaluate nil) ; you don't need my permission
(defun +org*babel-execute-src-block (orig-fn &rest args) (defun +org*babel-lazy-load-library (orig-fn info)
"Load babel libraries as needed when babel blocks are executed." "Load babel libraries as needed when babel blocks are executed."
(let* ((language (org-element-property :language (org-element-at-point))) (when (funcall orig-fn info)
(lang-sym (intern language))) (let* ((lang (nth 0 info))
(when (and (not (cdr (assq lang-sym org-babel-load-languages))) (lang (if (symbolp lang) lang (intern lang))))
(or (run-hook-with-args-until-success '+org-babel-load-functions language) (when (and (not (cdr (assq lang org-babel-load-languages)))
(or (run-hook-with-args-until-success '+org-babel-load-functions lang)
(require (require
(intern (format "ob-%s" (intern (format "ob-%s"
(or (cdr (assoc (downcase language) +org-babel-mode-alist)) (or (cdr (assq lang +org-babel-mode-alist))
language))) lang)))
nil t))) nil t)))
(map-put org-babel-load-languages lang-sym t)) (map-put org-babel-load-languages lang t))
(apply orig-fn args))) t)))
(advice-add #'org-babel-execute-src-block :around #'+org*babel-execute-src-block) (advice-add #'org-babel-confirm-evaluate :around #'+org*babel-lazy-load-library)
;; I prefer C-c C-c for confirming over the default C-c ' ;; I prefer C-c C-c for confirming over the default C-c '
(map! :map org-src-mode-map "C-c C-c" #'org-edit-src-exit) (map! :map org-src-mode-map "C-c C-c" #'org-edit-src-exit)
@ -65,8 +66,8 @@ string). Stops at the first function to return non-nil.")
(setq ob-ipython-resources-dir ".ob-ipython-resrc") (setq ob-ipython-resources-dir ".ob-ipython-resrc")
(defun +org|babel-load-ipython (language) (defun +org|babel-load-ipython (lang)
(and (string-match-p "^jupyter-" language) (and (string-match-p "^jupyter-" (symbol-name lang))
(require 'ob-ipython nil t))) (require 'ob-ipython nil t)))
(add-hook '+org-babel-load-functions #'+org|babel-load-ipython) (add-hook '+org-babel-load-functions #'+org|babel-load-ipython)
:config :config