summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorNicolas Goaziou <mail@nicolasgoaziou.fr>2016-02-26 20:00:43 +0100
committerNicolas Goaziou <mail@nicolasgoaziou.fr>2016-02-26 20:00:43 +0100
commite4d196758b6c93f1fdac662245ea9705d454fb21 (patch)
tree24828de9c905dfb35d9e462bbba8d043482c6a68
parent28d3e729e48414410009831d2aa9aae95d13e3c4 (diff)
parent1003b1025bdd86974c183f13fdbb0c500c484c75 (diff)
downloadorg-mode-e4d196758b6c93f1fdac662245ea9705d454fb21.tar.gz
Merge branch 'master' of orgmode.org:org-mode
-rw-r--r--lisp/org-agenda.el2
1 files changed, 1 insertions, 1 deletions
diff --git a/lisp/org-agenda.el b/lisp/org-agenda.el
index 86ba2f9..876ea44 100644
--- a/lisp/org-agenda.el
+++ b/lisp/org-agenda.el
@@ -10207,7 +10207,7 @@ to override `appt-message-warning-time'."
(wrn (get-text-property 1 'warntime x)))
;; FIXME: Shall we remove text-properties for the appt text?
;; (setq evt (set-text-properties 0 (length evt) nil evt))
- (when (and ok tod)
+ (when (and ok tod (not (string-match "\\`DONE\\|CANCELLED" evt)))
(setq tod (concat "00" (number-to-string tod))
tod (when (string-match
"\\([0-9]\\{1,2\\}\\)\\([0-9]\\{2\\}\\)\\'" tod)