diff options
| author | Nicolas Goaziou <mail@nicolasgoaziou.fr> | 2021-06-20 18:08:35 +0200 |
|---|---|---|
| committer | Nicolas Goaziou <mail@nicolasgoaziou.fr> | 2021-06-20 18:08:35 +0200 |
| commit | 5e4815f816e80e1f21795ee502f40e135a237a19 (patch) | |
| tree | 6f074026c515e9911cb717de6726bf597c91162e | |
| parent | ceb78e01598afd4a032969007754c61e091368d1 (diff) | |
| parent | c09356548f9fa01f38bf6b1e7606ffda89e33e74 (diff) | |
| download | org-mode-5e4815f816e80e1f21795ee502f40e135a237a19.tar.gz | |
Merge branch 'maint'
| -rw-r--r-- | lisp/org-agenda.el | 4 |
1 files 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"))) |