ndwarshuis
/
org-mode
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'master-apply-aaron-patch2' 

Conflicts:
	lisp/ob-core.el
This commit is contained in:
Bastien Guerry 2013-04-18 12:28:03 +02:00
parent ccdfa8ddf8 bf29482973
commit 03920a01fa
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-switch-to-session'." then run `org-babel-switch-to-session'."
(interactive) (interactive)
(let ((info (org-babel-get-src-block-info))) (org-babel-when-in-src-block
(if info (progn (org-babel-switch-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)