summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorEric Schulte <schulte.eric@gmail.com>2011-11-08 19:42:59 -0700
committerEric Schulte <schulte.eric@gmail.com>2011-11-08 19:43:55 -0700
commita4273cbe0e0480bd02c59464cafb985951b1c5a2 (patch)
tree482004584da1ec364915abc71ca651bc98e9f684
parent7720786c41c950ce0cfca7ca0126974c4a602a26 (diff)
downloadorg-mode-a4273cbe0e0480bd02c59464cafb985951b1c5a2.tar.gz
call lines are more careful about being in example or verbatim blocks
* lisp/ob-lob.el (org-babel-lob-execute-maybe): Don't execute a call inside a verbatim block. * lisp/ob-exp.el (org-babel-in-example-or-verbatim): Check for example blocks.
-rw-r--r--lisp/ob-exp.el1
-rw-r--r--lisp/ob-lob.el4
2 files changed, 4 insertions, 1 deletions
diff --git a/lisp/ob-exp.el b/lisp/ob-exp.el
index 3b102e1..3d2504f 100644
--- a/lisp/ob-exp.el
+++ b/lisp/ob-exp.el
@@ -172,6 +172,7 @@ org-mode text."
(goto-char (point-at-bol))
(looking-at "[ \t]*:[ \t]")))
(org-in-verbatim-emphasis)
+ (org-in-block-p org-list-forbidden-blocks)
(org-between-regexps-p "^[ \t]*#\\+begin_src" "^[ \t]*#\\+end_src")))
(defvar org-babel-default-lob-header-args)
diff --git a/lisp/ob-lob.el b/lisp/ob-lob.el
index be3033e..9a87b70 100644
--- a/lisp/ob-lob.el
+++ b/lisp/ob-lob.el
@@ -95,7 +95,9 @@ Detect if this is context for a Library Of Babel source block and
if so then run the appropriate source block from the Library."
(interactive)
(let ((info (org-babel-lob-get-info)))
- (if (nth 0 info) (progn (org-babel-lob-execute info) t) nil)))
+ (if (and (nth 0 info) (not (org-babel-in-example-or-verbatim)))
+ (progn (org-babel-lob-execute info) t)
+ nil)))
;;;###autoload
(defun org-babel-lob-get-info ()