diff options
author | Bastien Guerry <bzg@altern.org> | 2013-02-23 14:42:45 +0100 |
---|---|---|
committer | Bastien Guerry <bzg@altern.org> | 2013-02-23 14:42:45 +0100 |
commit | 64aae2fd2929a86d56f4eb01e50270d3f64e58be (patch) | |
tree | 82ad92fa3e987be1c572a641cea6749bde40ef15 | |
parent | b2e38cb030bc8c2c7927ed6a2226bb99b2e3fc17 (diff) | |
parent | b6b509bfd458cace38b9cb7e17b18d3f146b0c1a (diff) | |
download | org-mode-64aae2fd2929a86d56f4eb01e50270d3f64e58be.tar.gz |
Merge branch 'maint'
-rw-r--r-- | lisp/org.el | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/lisp/org.el b/lisp/org.el index cf4522d..d2dfb39 100644 --- a/lisp/org.el +++ b/lisp/org.el @@ -5511,8 +5511,10 @@ on a string that terminates immediately after the date.") (defconst org-tsr-regexp (concat org-ts-regexp "\\(--?-?" org-ts-regexp "\\)?") "Regular expression matching a time stamp or time stamp range.") -(defconst org-tsr-regexp-both (concat org-ts-regexp-both "\\(--?-?" - org-ts-regexp-both "\\)?") +(defconst org-tsr-regexp-both + (concat "[^][]" ;; Don't activate dates in links + org-ts-regexp-both "\\(--?-?" + org-ts-regexp-both "\\)?") "Regular expression matching a time stamp or time stamp range. The time stamps may be either active or inactive.") @@ -5822,8 +5824,8 @@ by a #." "Run through the buffer and add overlays to dates." (if (re-search-forward org-tsr-regexp-both 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 (1+ (match-beginning 0)) (match-end 0)) + (add-text-properties (1+ (match-beginning 0)) (match-end 0) (list 'mouse-face 'highlight 'keymap org-mouse-map)) (org-rear-nonsticky-at (match-end 0)) |