[elpa] externals/org 5e4815f: Merge branch 'maint'

[ELPA Syncer]

branch: externals/org
commit 5e4815f816e80e1f21795ee502f40e135a237a19
Merge: ceb78e0 c093565
Author: Nicolas Goaziou <mail@nicolasgoaziou.fr>
Commit: Nicolas Goaziou <mail@nicolasgoaziou.fr>

    Merge branch 'maint'
---
 lisp/org-agenda.el | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/lisp/org-agenda.el b/lisp/org-agenda.el
index a6bc8bc..44acd03 100644
--- a/lisp/org-agenda.el
+++ b/lisp/org-agenda.el
@@ -6995,8 +6995,8 @@ where H:MM is the duration above midnight."
                  (group-n 3 (or "am" "pm")))
              word-end)))
     (save-match-data
-      (when (and (not (eq 'org-link (get-text-property 1 'face s)))
-                 (string-match time-regexp s))
+      (when (and (string-match time-regexp s)
+                 (not (eq 'org-link (get-text-property 1 'face s))))
         (let ((hours
                (let* ((ampm (and (match-end 3) (downcase (match-string 3 s))))
                       (am-p (equal ampm "am")))