summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorNicolas Goaziou <mail@nicolasgoaziou.fr>2018-02-01 15:40:51 +0100
committerNicolas Goaziou <mail@nicolasgoaziou.fr>2018-02-01 15:40:51 +0100
commitb4cc12fc32a7713d97d9641777fb9c3983aac03a (patch)
tree105726ed545ba94a5a6bbf25a016f9fd731f9ce6
parentddc8e8eb23b1c87f6d1bc402b898706837ea0d79 (diff)
downloadorg-mode-b4cc12fc32a7713d97d9641777fb9c3983aac03a.tar.gz
ob-core: Fix infloop when filling a region with a source block
* lisp/ob-core.el (org-babel-do-in-edit-buffer): Do not move point. Reported-by: Yasushi SHOJI <yasushi.shoji@gmail.com> <http://lists.gnu.org/r/emacs-orgmode/2018-02/msg00006.html>
-rw-r--r--lisp/ob-core.el19
1 files changed, 15 insertions, 4 deletions
diff --git a/lisp/ob-core.el b/lisp/ob-core.el
index 3896d4d..d92ebd8 100644
--- a/lisp/ob-core.el
+++ b/lisp/ob-core.el
@@ -980,13 +980,24 @@ with a prefix argument then this is passed on to
(defmacro org-babel-do-in-edit-buffer (&rest body)
"Evaluate BODY in edit buffer if there is a code block at point.
Return t if a code block was found at point, nil otherwise."
- `(let ((org-src-window-setup 'switch-invisibly))
- (when (and (org-babel-where-is-src-block-head)
+ (declare (debug (body)))
+ `(let* ((element (org-element-at-point))
+ ;; This function is not supposed to move point. However,
+ ;; `org-edit-src-code' always moves point back into the
+ ;; source block. It is problematic if the point was before
+ ;; the code, e.g., on block's opening line. In this case,
+ ;; we want to restore this location after executing BODY.
+ (outside-position
+ (and (<= (line-beginning-position)
+ (org-element-property :post-affiliated element))
+ (point-marker)))
+ (org-src-window-setup 'switch-invisibly))
+ (when (and (org-babel-where-is-src-block-head element)
(org-edit-src-code))
(unwind-protect (progn ,@body)
- (org-edit-src-exit))
+ (org-edit-src-exit)
+ (when outside-position (goto-char outside-position)))
t)))
-(def-edebug-spec org-babel-do-in-edit-buffer (body))
(defun org-babel-do-key-sequence-in-edit-buffer (key)
"Read key sequence and execute the command in edit buffer.