Jelajahi Sumber

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.
Nicolas Goaziou 11 tahun lalu
induk
melakukan
fe1289b382
1 mengubah file dengan 15 tambahan dan 18 penghapusan
  1. 15 18
      lisp/ob-exp.el

+ 15 - 18
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