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

org.el (org-tsr-regexp-both): Don't activate dates in links 

* org.el (org-tsr-regexp-both): Don't activate dates in links.
(org-activate-dates): Change match boundaries according to the
new value of `org-tsr-regexp-both'.

Thanks to Richard Huang for reporting a related issue.
This commit is contained in:
Bastien Guerry 2013-02-23 14:42:11 +01:00
parent 9a21403bd7
commit b6b509bfd4
1 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
lisp/org.el
View File

@ -5209,7 +5209,9 @@ on a string that terminates immediately after the date.")
(defconst org-tsr-regexp (concat org-ts-regexp "\\(--?-?" (defconst org-tsr-regexp (concat org-ts-regexp "\\(--?-?"
org-ts-regexp "\\)?") org-ts-regexp "\\)?")
"Regular expression matching a time stamp or time stamp range.") "Regular expression matching a time stamp or time stamp range.")
(defconst org-tsr-regexp-both (concat org-ts-regexp-both "\\(--?-?" (defconst org-tsr-regexp-both
(concat "[^][]" ;; Don't activate dates in links
org-ts-regexp-both "\\(--?-?"
org-ts-regexp-both "\\)?") org-ts-regexp-both "\\)?")
"Regular expression matching a time stamp or time stamp range. "Regular expression matching a time stamp or time stamp range.
The time stamps may be either active or inactive.") The time stamps may be either active or inactive.")
@ -5516,8 +5518,8 @@ by a #."
"Run through the buffer and add overlays to dates." "Run through the buffer and add overlays to dates."
(if (re-search-forward org-tsr-regexp-both limit t) (if (re-search-forward org-tsr-regexp-both limit t)
(progn (progn
(org-remove-flyspell-overlays-in (match-beginning 0) (match-end 0)) (org-remove-flyspell-overlays-in (1+ (match-beginning 0)) (match-end 0))
(add-text-properties (match-beginning 0) (match-end 0) (add-text-properties (1+ (match-beginning 0)) (match-end 0)
(list 'mouse-face 'highlight (list 'mouse-face 'highlight
'keymap org-mouse-map)) 'keymap org-mouse-map))
(org-rear-nonsticky-at (match-end 0)) (org-rear-nonsticky-at (match-end 0))