ndwarshuis
/
org-mode
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'maint'

This commit is contained in:
Nicolas Goaziou 2021-04-10 00:03:31 +02:00
parent b07a31cbd7 b523ad491d
commit 80bce047ff
1 changed files with 3 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
lisp/ob-tangle.el
View File

@ -414,9 +414,8 @@ non-nil, return the full association list to be used by
(src-lang (nth 0 info)) (src-lang (nth 0 info))
(params (nth 2 info)) (params (nth 2 info))
(extra (nth 3 info)) (extra (nth 3 info))
(cref-fmt (or (and (string-match "-l \"\\(.+\\)\"" extra) (coderef (nth 6 info))
(match-string 1 extra)) (cref-regexp (org-src-coderef-regexp coderef))
org-coderef-label-format))
(link (let ((l (org-no-properties (org-store-link nil)))) (link (let ((l (org-no-properties (org-store-link nil))))
(and (string-match org-link-bracket-re l) (and (string-match org-link-bracket-re l)
(match-string 1 l)))) (match-string 1 l))))
@ -445,8 +444,7 @@ non-nil, return the full association list to be used by
(funcall assignments-cmd params)))))) (funcall assignments-cmd params))))))
(when (string-match "-r" extra) (when (string-match "-r" extra)
(goto-char (point-min)) (goto-char (point-min))
(while (re-search-forward (while (re-search-forward cref-regexp nil t)
(replace-regexp-in-string "%s" ".+" cref-fmt) nil t)
(replace-match ""))) (replace-match "")))
(run-hooks 'org-babel-tangle-body-hook) (run-hooks 'org-babel-tangle-body-hook)
(buffer-string)))) (buffer-string))))