Merge branch 'master' of orgmode.org:org-mode

This commit is contained in:
Nicolas Goaziou 2016-02-26 20:00:43 +01:00
commit e4d196758b

View file

@ -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)