浏览代码

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

Nicolas Goaziou 9 年之前
父节点
当前提交
e4d196758b
共有 1 个文件被更改,包括 1 次插入1 次删除
  1. 1 1
      lisp/org-agenda.el

+ 1 - 1
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)