summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBastien Guerry <bzg@altern.org>2013-04-18 17:27:17 +0200
committerBastien Guerry <bzg@altern.org>2013-04-18 17:27:17 +0200
commit1e3cb91ccb8ec3655aadd9309a7b5a7cf9b1ccfa (patch)
tree33959f0c4764fdee928baacc09ea7366f9eb73b0
parent60aa1682cea6667a411814bb65818cf38cdd8327 (diff)
downloadorg-mode-1e3cb91ccb8ec3655aadd9309a7b5a7cf9b1ccfa.tar.gz
org.el (org-store-link): Don't add a search string when storing a link from a radio target
* org.el (org-store-link): Don't add a search string when storing a link from a radio target. (org-open-at-point): Jump to the radio link (<<<radio>>>), not to the simple target (<<target>>).
-rw-r--r--lisp/org.el9
1 files changed, 6 insertions, 3 deletions
diff --git a/lisp/org.el b/lisp/org.el
index 1ceeda2..b41185e 100644
--- a/lisp/org.el
+++ b/lisp/org.el
@@ -9466,8 +9466,8 @@ active region."
((and (buffer-file-name (buffer-base-buffer)) (derived-mode-p 'org-mode))
(setq custom-id (org-entry-get nil "CUSTOM_ID"))
(cond
- ;; Store a link using the radio target at point
- ((org-in-regexp "<<\\(.*?\\)>>")
+ ;; Store a link using the target at point
+ ((org-in-regexp "[^<]<<\\([^<>]+\\)>>[^>]" 1)
(setq cpltxt
(concat "file:"
(abbreviate-file-name
@@ -10329,7 +10329,10 @@ application the system uses for this file type."
(or (previous-single-property-change pos 'org-linked-text)
(point-min))
(or (next-single-property-change pos 'org-linked-text)
- (point-max))))
+ (point-max)))
+ ;; Ensure we will search for a <<<radio>>> link, not
+ ;; a simple reference like <<ref>>
+ path (concat "<" path))
(throw 'match t))
(save-excursion