tec/org-mode
tec/org-mode
1
0
Fork 0
forked from mirrors/org-mode
Code Pull requests Releases Activity

Clean up various org-babel-*-maybe commands

Browse source 
* lisp/ob-core.el (org-babel-when-in-src-block): New macro.
  (org-babel-execute-src-block-maybe)
  (org-babel-expand-src-block-maybe)
  (org-babel-load-in-session-maybe, org-babel-pop-to-session-maybe):
  Use it.

org-babel-get-src-block-info is a potentially expensive operation, which
is why its ‘light’ argument exists.  But in any case, it is overkill to
query the whole info, if all that is needed is whether point is in a
block or not.  Factor the simplified common code out into a macro.
This commit is contained in:
Aaron Ecay 2013-04-18 04:06:55 -04:00 committed by Bastien Guerry
parent 79ecb6570b
commit bf29482973
1 changed files with 20 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

34
lisp/ob-core.el
View file

@ -351,15 +351,25 @@ of potentially harmful code."
(or (org-babel-execute-src-block-maybe) (or (org-babel-execute-src-block-maybe)
(org-babel-lob-execute-maybe))) (org-babel-lob-execute-maybe)))
(defmacro org-babel-when-in-src-block (&rest body)
"Execute BODY if point is in a source block and return t.
Otherwise do nothing and return nil."
`(if (or (org-babel-where-is-src-block-head)
(org-babel-get-inline-src-block-matches))
(progn
,@body
t)
nil))
(defun org-babel-execute-src-block-maybe () (defun org-babel-execute-src-block-maybe ()
"Conditionally execute a source block. "Conditionally execute a source block.
Detect if this is context for a Babel src-block and if so Detect if this is context for a Babel src-block and if so
then run `org-babel-execute-src-block'." then run `org-babel-execute-src-block'."
(interactive) (interactive)
(let ((info (org-babel-get-src-block-info))) (org-babel-when-in-src-block
(if info (org-babel-eval-wipe-error-buffer)
(progn (org-babel-eval-wipe-error-buffer) (org-babel-execute-src-block current-prefix-arg)))
(org-babel-execute-src-block current-prefix-arg info) t) nil)))
;;;###autoload ;;;###autoload
(defun org-babel-view-src-block-info () (defun org-babel-view-src-block-info ()
@ -395,10 +405,8 @@ a window into the `org-babel-get-src-block-info' function."
Detect if this is context for a org-babel src-block and if so Detect if this is context for a org-babel src-block and if so
then run `org-babel-expand-src-block'." then run `org-babel-expand-src-block'."
(interactive) (interactive)
(let ((info (org-babel-get-src-block-info))) (org-babel-when-in-src-block
(if info (org-babel-expand-src-block current-prefix-arg)))
(progn (org-babel-expand-src-block current-prefix-arg info) t)
nil)))
;;;###autoload ;;;###autoload
(defun org-babel-load-in-session-maybe () (defun org-babel-load-in-session-maybe ()
@ -406,10 +414,8 @@ then run `org-babel-expand-src-block'."
Detect if this is context for a org-babel src-block and if so Detect if this is context for a org-babel src-block and if so
then run `org-babel-load-in-session'." then run `org-babel-load-in-session'."
(interactive) (interactive)
(let ((info (org-babel-get-src-block-info))) (org-babel-when-in-src-block
(if info (org-babel-load-in-session current-prefix-arg)))
(progn (org-babel-load-in-session current-prefix-arg info) t)
nil)))
(add-hook 'org-metaup-hook 'org-babel-load-in-session-maybe) (add-hook 'org-metaup-hook 'org-babel-load-in-session-maybe)
@ -419,8 +425,8 @@ then run `org-babel-load-in-session'."
Detect if this is context for a org-babel src-block and if so Detect if this is context for a org-babel src-block and if so
then run `org-babel-pop-to-session'." then run `org-babel-pop-to-session'."
(interactive) (interactive)
(let ((info (org-babel-get-src-block-info))) (org-babel-when-in-src-block
(if info (progn (org-babel-pop-to-session current-prefix-arg info) t) nil))) (org-babel-switch-to-session current-prefix-arg)))
(add-hook 'org-metadown-hook 'org-babel-pop-to-session-maybe) (add-hook 'org-metadown-hook 'org-babel-pop-to-session-maybe)