[elpa] externals/org 4651121 45/85: Merge branch 'bugfix'

[ELPA Syncer]

branch: externals/org
commit 46511212e9a1eb47b9493c42002a6ae496cdd856
Merge: 3d35718 0b4e357
Author: Bastien <bzg@gnu.org>
Commit: Bastien <bzg@gnu.org>

    Merge branch 'bugfix'
---
 lisp/ob-tangle.el | 17 +++++++++++++++--
 1 file changed, 15 insertions(+), 2 deletions(-)

diff --git a/lisp/ob-tangle.el b/lisp/ob-tangle.el
index 30b55e5..8d0348e 100644
--- a/lisp/ob-tangle.el
+++ b/lisp/ob-tangle.el
@@ -429,7 +429,14 @@ non-nil, return the full association list to be used by
         (extra (nth 3 info))
          (coderef (nth 6 info))
         (cref-regexp (org-src-coderef-regexp coderef))
-        (link (let ((l (org-no-properties (org-store-link nil))))
+        (link (let* (
+                      ;; The created link is transient.  Using ID is
+                      ;; not necessary, but could have side-effects if
+                      ;; used.  An ID property may be added to
+                      ;; existing entries thus creatin unexpected file
+                      ;; modifications.
+                      (org-id-link-to-org-use-id nil)
+                      (l (org-no-properties (org-store-link nil))))
                  (and (string-match org-link-bracket-re l)
                       (match-string 1 l))))
         (source-name
@@ -515,7 +522,13 @@ by `org-babel-get-src-block-info'."
                                           (number-to-string
                                            (line-number-at-pos))))
                        ("file" . ,(buffer-file-name))
-                       ("link" . ,(org-no-properties (org-store-link nil)))
+                       ("link" . ,(let (;; The created link is transient.  
Using ID is
+                                         ;; not necessary, but could have 
side-effects if
+                                         ;; used.  An ID property may be added 
to
+                                         ;; existing entries thus creatin 
unexpected file
+                                         ;; modifications.
+                                         (org-id-link-to-org-use-id nil))
+                                     (org-no-properties (org-store-link nil))))
                        ("source-name" . ,name))))))
     (list (org-fill-template org-babel-tangle-comment-format-beg link-data)
          (org-fill-template org-babel-tangle-comment-format-end link-data))))