From 061904b58ee8af2360102121edb44e079c2ef2ac Mon Sep 17 00:00:00 2001 From: Bastien Guerry Date: Mon, 26 May 2014 07:35:24 +0200 Subject: [PATCH] org-agenda.el (org-get-time-of-day): Don't return time string from within links * org-agenda.el (org-get-time-of-day): Don't return time string from within links. Thanks to Thomas Morgan for reporting this. --- lisp/org-agenda.el | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/lisp/org-agenda.el b/lisp/org-agenda.el index 270b95e2a..7d996e175 100644 --- a/lisp/org-agenda.el +++ b/lisp/org-agenda.el @@ -6753,8 +6753,10 @@ The optional STRING argument forces conversion into a 5 character wide string HH:MM." (save-match-data (when - (or (string-match "\\<\\([012]?[0-9]\\)\\(:\\([0-5][0-9]\\)\\)\\([AaPp][Mm]\\)?\\> *" s) - (string-match "\\<\\([012]?[0-9]\\)\\(:\\([0-5][0-9]\\)\\)?\\([AaPp][Mm]\\)\\> *" s)) + (and + (or (string-match "\\<\\([012]?[0-9]\\)\\(:\\([0-5][0-9]\\)\\)\\([AaPp][Mm]\\)?\\> *" s) + (string-match "\\<\\([012]?[0-9]\\)\\(:\\([0-5][0-9]\\)\\)?\\([AaPp][Mm]\\)\\> *" s)) + (not (eq (get-text-property 1 'face s) 'org-link))) (let* ((h (string-to-number (match-string 1 s))) (m (if (match-end 3) (string-to-number (match-string 3 s)) 0)) (ampm (if (match-end 4) (downcase (match-string 4 s))))