summaryrefslogtreecommitdiff
path: root/lisp/ob-tangle.el
diff options
context:
space:
mode:
authorS├ębastien Delafond <sdelafond@gmail.com>2016-03-16 09:54:04 +0100
committerS├ębastien Delafond <sdelafond@gmail.com>2016-03-16 09:54:04 +0100
commit84539dca3aa301ecfe48858eceef1ced0505388b (patch)
treea3c7c7bcc50e7d7a49b22f0eaf8bd8624ff8d048 /lisp/ob-tangle.el
parent8d8ea67656b95d8528b6cd9b43b2d53b847412b0 (diff)
Imported Upstream version 8.3.4
Diffstat (limited to 'lisp/ob-tangle.el')
-rw-r--r--lisp/ob-tangle.el48
1 files changed, 28 insertions, 20 deletions
diff --git a/lisp/ob-tangle.el b/lisp/ob-tangle.el
index e9af695..a42dd1d 100644
--- a/lisp/ob-tangle.el
+++ b/lisp/ob-tangle.el
@@ -29,16 +29,20 @@
(require 'org-src)
(declare-function make-directory "files" (dir &optional parents))
+(declare-function org-at-heading-p "org" (&optional ignored))
(declare-function org-babel-update-block-body "org" (new-body))
(declare-function org-back-to-heading "org" (invisible-ok))
(declare-function org-before-first-heading-p "org" ())
(declare-function org-edit-special "org" (&optional arg))
+(declare-function org-element-at-point "org-element" ())
+(declare-function org-element-type "org-element" (element))
(declare-function org-fill-template "org" (template alist))
(declare-function org-heading-components "org" ())
(declare-function org-in-commented-heading-p "org" (&optional no-inheritance))
(declare-function org-link-escape "org" (text &optional table))
(declare-function org-open-link-from-string "org" (s &optional arg reference-buffer))
(declare-function org-store-link "org" (arg))
+(declare-function org-string-nw-p "org" (s))
(declare-function outline-previous-heading "outline" ())
(defvar org-link-types-re)
@@ -364,8 +368,9 @@ that the appropriate major-mode is set. SPEC has the form:
(if (stringp le) le (format "%S" le)))))
'(start-line file link source-name)))
(insert-comment (lambda (text)
- (when (and comments (not (string= comments "no"))
- (> (length text) 0))
+ (when (and comments
+ (not (string= comments "no"))
+ (org-string-nw-p text))
(if org-babel-tangle-uncomment-comments
;; Plain comments: no processing.
(insert text)
@@ -545,7 +550,7 @@ which enable the original code blocks to be found."
(prog1 counter (message "Detangled %d code blocks" counter)))))
(defun org-babel-tangle-jump-to-org ()
- "Jump from a tangled code file to the related Org-mode file."
+ "Jump from a tangled code file to the related Org mode file."
(interactive)
(let ((mid (point))
start body-start end done
@@ -554,9 +559,8 @@ which enable the original code blocks to be found."
(save-excursion
(while (and (re-search-backward org-bracket-link-analytic-regexp nil t)
(not ; ever wider searches until matching block comments
- (and (setq start (point-at-eol))
- (setq body-start (save-excursion
- (forward-line 2) (point-at-bol)))
+ (and (setq start (line-beginning-position))
+ (setq body-start (line-beginning-position 2))
(setq link (match-string 0))
(setq path (match-string 3))
(setq block-name (match-string 5))
@@ -565,29 +569,33 @@ which enable the original code blocks to be found."
(re-search-forward
(concat " " (regexp-quote block-name)
" ends here") nil t)
- (setq end (point-at-bol))))))))
+ (setq end (line-beginning-position))))))))
(unless (and start (< start mid) (< mid end))
(error "Not in tangled code"))
- (setq body (org-babel-trim (buffer-substring start end))))
+ (setq body (buffer-substring body-start end)))
(when (string-match "::" path)
(setq path (substring path 0 (match-beginning 0))))
- (find-file path) (setq target-buffer (current-buffer))
- (goto-char start) (org-open-link-from-string link)
+ (find-file path)
+ (setq target-buffer (current-buffer))
+ ;; Go to the beginning of the relative block in Org file.
+ (org-open-link-from-string link)
(if (string-match "[^ \t\n\r]:\\([[:digit:]]+\\)" block-name)
- (org-babel-next-src-block
- (string-to-number (match-string 1 block-name)))
+ (let ((n (string-to-number (match-string 1 block-name))))
+ (if (org-before-first-heading-p) (goto-char (point-min))
+ (org-back-to-heading t))
+ ;; Do not skip the first block if it begins at point min.
+ (cond ((or (org-at-heading-p)
+ (not (eq (org-element-type (org-element-at-point))
+ 'src-block)))
+ (org-babel-next-src-block n))
+ ((= n 1))
+ (t (org-babel-next-src-block (1- n)))))
(org-babel-goto-named-src-block block-name))
- ;; position at the beginning of the code block body
(goto-char (org-babel-where-is-src-block-head))
+ ;; Preserve location of point within the source code in tangled
+ ;; code file.
(forward-line 1)
- ;; Use org-edit-special to isolate the code.
- (org-edit-special)
- ;; Then move forward the correct number of characters in the
- ;; code buffer.
(forward-char (- mid body-start))
- ;; And return to the Org-mode buffer with the point in the right
- ;; place.
- (org-edit-src-exit)
(setq target-char (point)))
(org-src-switch-to-buffer target-buffer t)
(prog1 body (goto-char target-char))))