[elpa] externals/org 543a23a57d 3/6: Revert "lisp/ol.el: Fix bug when storing links"

[ELPA Syncer]

branch: externals/org
commit 543a23a57d2947cd01c906d134ae9c5c8d0907c4
Author: Max Nikulin <manikulin@gmail.com>
Commit: Ihor Radchenko <yantar92@gmail.com>

    Revert "lisp/ol.el: Fix bug when storing links"
    
    This reverts commit b4b35fc92d6ea8eb2ac061b8ccf026e9b4ebfe33.
    
    Avoid duplication of CUSTOM_ID links.
---
 lisp/ol.el | 17 +++++------------
 1 file changed, 5 insertions(+), 12 deletions(-)

diff --git a/lisp/ol.el b/lisp/ol.el
index 20b085682d..7401db952d 100644
--- a/lisp/ol.el
+++ b/lisp/ol.el
@@ -1659,8 +1659,9 @@ non-nil."
 
        ((and (buffer-file-name (buffer-base-buffer)) (derived-mode-p 
'org-mode))
        (org-with-limited-levels
-         (cond
-         ;; Store a link using the target at point.
+        (setq custom-id (org-entry-get nil "CUSTOM_ID"))
+        (cond
+         ;; Store a link using the target at point
          ((org-in-regexp "[^<]<<\\([^<>]+\\)>>[^>]" 1)
           (setq cpltxt
                 (concat "file:"
@@ -1668,15 +1669,6 @@ non-nil."
                          (buffer-file-name (buffer-base-buffer)))
                         "::" (match-string 1))
                 link cpltxt))
-          ;; Store a link using the CUSTOM_ID property.
-          ((setq custom-id (org-entry-get nil "CUSTOM_ID"))
-           (setq cpltxt
-                (concat "file:"
-                        (abbreviate-file-name
-                         (buffer-file-name (buffer-base-buffer)))
-                        "::#" custom-id)
-                link cpltxt))
-          ;; Store a link using (and perhaps creating) the ID property.
          ((and (featurep 'org-id)
                (or (eq org-id-link-to-org-use-id t)
                    (and interactive?
@@ -1685,13 +1677,14 @@ non-nil."
                                      'create-if-interactive-and-no-custom-id)
                                  (not custom-id))))
                    (and org-id-link-to-org-use-id (org-entry-get nil "ID"))))
+          ;; Store a link using the ID at point
           (setq link (condition-case nil
                          (prog1 (org-id-store-link)
                            (setq desc (or (plist-get org-store-link-plist
                                                      :description)
                                           "")))
                        (error
-                        ;; Probably before first headline, link only to file.
+                        ;; Probably before first headline, link only to file
                         (concat "file:"
                                 (abbreviate-file-name
                                  (buffer-file-name (buffer-base-buffer))))))))