diff options
| author | Tom Gillespie <tgbugs@gmail.com> | 2021-04-07 12:29:01 -0700 |
|---|---|---|
| committer | Nicolas Goaziou <mail@nicolasgoaziou.fr> | 2021-04-10 00:01:49 +0200 |
| commit | b523ad491dd3d3aebac77d42e48eac1e0ff345f1 (patch) | |
| tree | c341d6bd053d841100147283006b44874a37b498 | |
| parent | 5469bc4e552784c2d4f1b32984b95c371fbd4425 (diff) | |
| download | org-mode-b523ad491dd3d3aebac77d42e48eac1e0ff345f1.tar.gz | |
ob-tangle.el: Fix coderef removal during tangling
* lisp/ob-tangle.el (orb-babel-tangle-single-block): Regularize
behavior when removing coderefs during tangling. This fixes an issue
where trailing whitespace would be retained when coderefs were removed
for tangling.
| -rw-r--r-- | lisp/ob-tangle.el | 8 |
1 files changed, 3 insertions, 5 deletions
diff --git a/lisp/ob-tangle.el b/lisp/ob-tangle.el index 3c3943c..b9f9eb7 100644 --- a/lisp/ob-tangle.el +++ b/lisp/ob-tangle.el @@ -415,9 +415,8 @@ non-nil, return the full association list to be used by (src-lang (nth 0 info)) (params (nth 2 info)) (extra (nth 3 info)) - (cref-fmt (or (and (string-match "-l \"\\(.+\\)\"" extra) - (match-string 1 extra)) - org-coderef-label-format)) + (coderef (nth 6 info)) + (cref-regexp (org-src-coderef-regexp coderef)) (link (let ((l (org-no-properties (org-store-link nil)))) (and (string-match org-link-bracket-re l) (match-string 1 l)))) @@ -446,8 +445,7 @@ non-nil, return the full association list to be used by (funcall assignments-cmd params)))))) (when (string-match "-r" extra) (goto-char (point-min)) - (while (re-search-forward - (replace-regexp-in-string "%s" ".+" cref-fmt) nil t) + (while (re-search-forward cref-regexp nil t) (replace-match ""))) (run-hooks 'org-babel-tangle-body-hook) (buffer-string)))) |