summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBastien Guerry <bzg@altern.org>2014-05-26 07:36:06 +0200
committerBastien Guerry <bzg@altern.org>2014-05-26 07:36:06 +0200
commit8d0da67ea0211bcbd833a89d3b36dff2661ddd76 (patch)
treec99d91296eec4bac41efe458b839b3107195e30e
parent77ffc73a4aeb93ddc54c4adbf81971cd055c2759 (diff)
parent061904b58ee8af2360102121edb44e079c2ef2ac (diff)
downloadorg-mode-8d0da67ea0211bcbd833a89d3b36dff2661ddd76.tar.gz
Merge branch 'maint'
-rw-r--r--lisp/org-agenda.el6
1 files changed, 4 insertions, 2 deletions
diff --git a/lisp/org-agenda.el b/lisp/org-agenda.el
index 8c39bc5..c49708c 100644
--- a/lisp/org-agenda.el
+++ b/lisp/org-agenda.el
@@ -6728,8 +6728,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))))