forked from mirrors/org-mode
No alphanumeric characters around radio links
* lisp/org.el (org-make-target-link-regexp): Change regexp so alphanumeric characters cannot be found next to a radio link. (org-activate-target-links): Apply changes to radio link regexp. * lisp/org-element.el (org-element--object-lex, org-element-link-parser): Apply changes to radio link regexp. * testing/lisp/test-org-element.el (test-org-element/link-parser): Update test. Patch suggested by Daniel Clemente. http://permalink.gmane.org/gmane.emacs.orgmode/84461
This commit is contained in:
parent
e8112c86ec
commit
7c82e6ac19
|
@ -2943,12 +2943,14 @@ Assume point is at the beginning of the link."
|
|||
raw-link link search-option application)
|
||||
(cond
|
||||
;; Type 1: Text targeted from a radio target.
|
||||
((and org-target-link-regexp (looking-at org-target-link-regexp))
|
||||
((and org-target-link-regexp
|
||||
(save-excursion (or (bolp) (backward-char))
|
||||
(looking-at org-target-link-regexp)))
|
||||
(setq type "radio"
|
||||
link-end (match-end 0)
|
||||
path (org-match-string-no-properties 0)
|
||||
contents-begin (match-beginning 0)
|
||||
contents-end (match-end 0)))
|
||||
link-end (match-end 1)
|
||||
path (org-match-string-no-properties 1)
|
||||
contents-begin (match-beginning 1)
|
||||
contents-end (match-end 1)))
|
||||
;; Type 2: Standard link, i.e. [[http://orgmode.org][homepage]]
|
||||
((looking-at org-bracket-link-regexp)
|
||||
(setq contents-begin (match-beginning 3)
|
||||
|
@ -4184,8 +4186,9 @@ to an appropriate container (e.g., a paragraph)."
|
|||
(save-excursion
|
||||
(let ((limit (and org-target-link-regexp
|
||||
(save-excursion
|
||||
(or (bolp) (backward-char))
|
||||
(re-search-forward org-target-link-regexp nil t))
|
||||
(match-beginning 0)))
|
||||
(match-beginning 1)))
|
||||
found)
|
||||
(while (and (not found)
|
||||
(re-search-forward org-element--object-regexp limit t))
|
||||
|
|
10
lisp/org.el
10
lisp/org.el
|
@ -6091,13 +6091,13 @@ by a #."
|
|||
(let ((case-fold-search t))
|
||||
(if (re-search-forward org-target-link-regexp limit t)
|
||||
(progn
|
||||
(org-remove-flyspell-overlays-in (match-beginning 0) (match-end 0))
|
||||
(add-text-properties (match-beginning 0) (match-end 0)
|
||||
(org-remove-flyspell-overlays-in (match-beginning 1) (match-end 1))
|
||||
(add-text-properties (match-beginning 1) (match-end 1)
|
||||
(list 'mouse-face 'highlight
|
||||
'keymap org-mouse-map
|
||||
'help-echo "Radio target link"
|
||||
'org-linked-text t))
|
||||
(org-rear-nonsticky-at (match-end 0))
|
||||
(org-rear-nonsticky-at (match-end 1))
|
||||
t)))))
|
||||
|
||||
(defun org-update-radio-target-regexp ()
|
||||
|
@ -6192,13 +6192,13 @@ targets."
|
|||
The regular expression finds the targets also if there is a line break
|
||||
between words."
|
||||
(and targets
|
||||
(concat "\\("
|
||||
(concat "\\(?:^\\|[^[:alnum:]]\\)\\("
|
||||
(mapconcat
|
||||
(lambda (x)
|
||||
(replace-regexp-in-string " +" "\\s-+" (regexp-quote x) t t))
|
||||
targets
|
||||
"\\|")
|
||||
"\\)")))
|
||||
"\\)\\(?:$\\|[^[:alnum:]]\\)")))
|
||||
|
||||
(defun org-activate-tags (limit)
|
||||
(if (re-search-forward (org-re "^\\*+.*[ \t]\\(:[[:alnum:]_@#%:]+:\\)[ \r\n]") limit t)
|
||||
|
|
|
@ -1336,12 +1336,11 @@ e^{i\\pi}+1=0
|
|||
(should
|
||||
(equal
|
||||
"radio"
|
||||
(org-test-with-temp-text "A radio link"
|
||||
(org-test-with-temp-text "<<<radio>>>A radio link"
|
||||
(org-update-radio-target-regexp)
|
||||
(org-element-property
|
||||
:type
|
||||
(org-element-map
|
||||
(let ((org-target-link-regexp "radio")) (org-element-parse-buffer))
|
||||
'link 'identity nil t)))))
|
||||
(org-element-map (org-element-parse-buffer) 'link #'identity nil t)))))
|
||||
;; Standard link.
|
||||
;;
|
||||
;; ... with description.
|
||||
|
|
Loading…
Reference in a new issue