Browse Source

ob: inserting inline call block results appropriately

* lisp/ob-lob.el (org-babel-inline-lob-one-liner-regexp): Removing
  this trailing space ensures that the insertion of the results looks
  nice.
* lisp/ob.el (org-babel-insert-result): Insert inline lob line results
  as inline results.
Eric Schulte 14 years ago
parent
commit
6c771d236d
2 changed files with 9 additions and 7 deletions
  1. 1 1
      lisp/ob-lob.el
  2. 8 6
      lisp/ob.el

+ 1 - 1
lisp/ob-lob.el

@@ -83,7 +83,7 @@ If you change the value of this variable then your files may
    "\\([^\n]*\\)\\(?:"
    (mapconcat #'regexp-quote org-babel-lob-call-aliases "\\|")
    "\\)_\\([^\(\)\n]+?\\)\\(\\[\\(.*\\)\\]\\|\\(\\)\\)"
-   "\(\\([^\n]*\\)\)\\(\\[.+\\]\\|\\)\\(\\[\\([^\\[\\]]*\\)\\]\\)?[ \t]*")
+   "\(\\([^\n]*\\)\)\\(\\[.+\\]\\|\\)\\(\\[\\([^\\[\\]]*\\)\\]\\)?")
   "Regexp to match inline calls to predefined source block functions.")
 
 (defconst org-babel-lob-one-liner-regexp

+ 8 - 6
lisp/ob.el

@@ -1529,12 +1529,14 @@ code ---- the results are extracted in the syntax of the source
 	(message (replace-regexp-in-string "%" "%%" (format "%S" result)))
 	result)
     (save-excursion
-      (let* ((inlinep (save-excursion
-			(re-search-backward "[ \f\t\n\r\v]" nil t)
-			(when (looking-at org-babel-inline-src-block-regexp)
-			  (goto-char (match-end 0))
-			  (insert (if (listp result) "\n" " "))
-			  (point))))
+      (let* ((inlinep
+	      (save-excursion
+		(re-search-backward "[ \f\t\n\r\v]" nil t)
+		(when (or (looking-at org-babel-inline-src-block-regexp)
+			  (looking-at org-babel-inline-lob-one-liner-regexp))
+		  (goto-char (match-end 0))
+		  (insert (if (listp result) "\n" " "))
+		  (point))))
 	     (existing-result (unless inlinep
 				(org-babel-where-is-src-block-result
 				 t info hash indent)))