summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorNicolas Goaziou <n.goaziou@gmail.com>2013-09-03 13:59:33 +0200
committerNicolas Goaziou <n.goaziou@gmail.com>2013-09-03 14:10:38 +0200
commitfe1289b38257ebe57f498492538eaa341424ab6e (patch)
treede0f5a9592bc5bb00bb4d1be0801bc800afc1226
parent0022904e83babacbdbaf167fcbf488dbf90dd78e (diff)
downloadorg-mode-fe1289b38257ebe57f498492538eaa341424ab6e.tar.gz
Revert "ignore inline source block on #+ prefixed lines"
This reverts commit 24812caff400bab66b66c42e761cbb5a8fc9525f. This is a wrong fix sinc the function already calls `org-element-context', which cannot find Babel code in macros anyway.
-rw-r--r--lisp/ob-exp.el33
1 files changed, 15 insertions, 18 deletions
diff --git a/lisp/ob-exp.el b/lisp/ob-exp.el
index 136ed39..c8479e3 100644
--- a/lisp/ob-exp.el
+++ b/lisp/ob-exp.el
@@ -183,27 +183,24 @@ this template."
info (org-babel-exp-get-export-buffer))
(nth 1 info)))
(goto-char beg-el)
- (unless (save-excursion (goto-char (point-at-bol))
- (looking-at "^#\\+"))
- (let ((replacement (org-babel-exp-do-export
- info 'inline)))
- (if (equal replacement "")
- ;; Replacement code is empty: completely
- ;; remove inline src block, including extra
- ;; white space that might have been created
- ;; when inserting results.
- (delete-region beg-el
- (progn (goto-char end-el)
- (skip-chars-forward " \t")
- (point)))
- ;; Otherwise: remove inline src block but
- ;; preserve following white spaces. Then
- ;; insert value.
+ (let ((replacement (org-babel-exp-do-export info 'inline)))
+ (if (equal replacement "")
+ ;; Replacement code is empty: completely
+ ;; remove inline src block, including extra
+ ;; white space that might have been created
+ ;; when inserting results.
(delete-region beg-el
(progn (goto-char end-el)
- (skip-chars-backward " \t")
+ (skip-chars-forward " \t")
(point)))
- (insert replacement))))))
+ ;; Otherwise: remove inline src block but
+ ;; preserve following white spaces. Then
+ ;; insert value.
+ (delete-region beg-el
+ (progn (goto-char end-el)
+ (skip-chars-backward " \t")
+ (point)))
+ (insert replacement)))))
((babel-call inline-babel-call)
(let* ((lob-info (org-babel-lob-get-info))
(results