mirror/org-mode
1
0
Fork 0
mirror of https://git.savannah.gnu.org/git/emacs/org-mode.git synced 2024-11-23 07:18:53 +00:00
Code

ob-core.el: inline src block removal bugfix

Browse Source 
* ob.core.el (org-babel-remove-inline-result): Removing an inline src
  block result removes all whitespace preceding it. The function is
  now `interactive'.

  * ob-core.el (org-babel-insert-result): The call to
  `org-babel-remove-inline-result' preceeds insertion of whitespace
  and setting location of local variable `inlinep'.

  Daniele Pizzolli reported that cleaning a buffer by evaluating
  `org-babel-remove-inline-result' can leave unwanted whitespace.  That
  bug is fixed, and the function is made `interactive'.
This commit is contained in:
Charles Berry 2015-01-30 19:27:54 -08:00
parent fe63e59faf
commit 37fc8667e0
1 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
lisp/ob-core.el
View File

@ -2144,12 +2144,12 @@ INFO may provide the values of these header arguments (in the
(when (or (org-babel-get-inline-src-block-matches)
(org-babel-get-lob-one-liner-matches))
(goto-char (match-end 0))
(org-babel-remove-inline-result)
(insert " ")
(point))))
(existing-result (if inlinep
(org-babel-remove-inline-result)
(org-babel-where-is-src-block-result
t info hash indent)))
(existing-result
(unless inlinep
(org-babel-where-is-src-block-result t info hash indent)))
(bad-inline-p
(when inlinep
(or
@ -2322,8 +2322,9 @@ INFO may provide the values of these header arguments (in the
(defun org-babel-remove-inline-result ()
"Remove the result of the current inline-src-block or babel call.
The result must be wrapped in a `results' macro to be
removed. Extraneous leading whitespace is trimmed."
The result must be wrapped in a `results' macro to be removed.
Leading whitespace is trimmed."
(interactive)
(let* ((el (org-element-context))
(post-blank (org-element-property :post-blank el)))
(when (memq (org-element-type el) '(inline-src-block inline-babel-call))
@ -2332,9 +2333,8 @@ The result must be wrapped in a `results' macro to be
(let ((el (org-element-context)))
(when (and (eq (org-element-type el) 'macro)
(string= (org-element-property :key el) "results"))
(delete-region ; And (only) extra leading whitespace.
(- (org-element-property :begin el)
(- post-blank 1))
(delete-region ; And leading whitespace.
(- (org-element-property :begin el) post-blank)
(- (org-element-property :end el)
(org-element-property :post-blank el)))))))))