From 01748861d42af99dd6a4c9b2f98a1991011a30bc Mon Sep 17 00:00:00 2001 From: Bastien Guerry Date: Wed, 27 Feb 2013 17:28:33 +0100 Subject: [PATCH] Fix b6b509b again. Thanks to Nicolas Richard for reporting this. --- lisp/org.el | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/lisp/org.el b/lisp/org.el index 8dd7bf021..574c2a876 100644 --- a/lisp/org.el +++ b/lisp/org.el @@ -5212,9 +5212,8 @@ on a string that terminates immediately after the date.") org-ts-regexp "\\)?") "Regular expression matching a time stamp or time stamp range.") (defconst org-tsr-regexp-both - (concat "[^][]\\(" ;; Don't activate dates in links - org-ts-regexp-both "\\(--?-?" - org-ts-regexp-both "\\)?\\)") + (concat 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.") @@ -5517,7 +5516,8 @@ by a #." (defun org-activate-dates (limit) "Run through the buffer and add overlays to dates." - (if (re-search-forward org-tsr-regexp-both limit t) + (if (and (re-search-forward org-tsr-regexp-both limit t) + (not (equal (char-before (match-beginning 0)) 91))) (progn (org-remove-flyspell-overlays-in (match-beginning 1) (match-end 1)) (add-text-properties (match-beginning 1) (match-end 1) @@ -5773,7 +5773,7 @@ needs to be inserted at a specific position in the font-lock sequence.") (if (memq 'plain lk) '(org-activate-plain-links)) (if (memq 'bracket lk) '(org-activate-bracket-links (0 'org-link t))) (if (memq 'radio lk) '(org-activate-target-links (0 'org-link t))) - (if (memq 'date lk) '(org-activate-dates (1 'org-date t))) + (if (memq 'date lk) '(org-activate-dates (0 'org-date t))) (if (memq 'footnote lk) '(org-activate-footnote-links)) '("^&?%%(.*\\|<%%([^>\n]*?>" (0 'org-sexp-date t)) '(org-hide-wide-columns (0 nil append))