From c24383d1c691e18f24c677d9ed71e81dbf87950b Mon Sep 17 00:00:00 2001 From: Carsten Dominik Date: Thu, 4 Sep 2008 17:08:50 +0200 Subject: [PATCH] Fix bugs with time extraction of deadlines. --- lisp/ChangeLog | 4 ++++ lisp/org-agenda.el | 6 ++++-- 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/lisp/ChangeLog b/lisp/ChangeLog index 67e19bf8d..7dd4b6700 100755 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog @@ -1,5 +1,9 @@ 2008-09-04 Carsten Dominik + * org-agenda.el (org-agenda-get-deadlines) + (org-agenda-get-scheduled): Avoid `time-of-day' extraction for + entries that are pre-warnings of deadlines or reminders. + * org.el (org-sort-entries-or-items): Make numeric and alpha comparisons ignore any TODO keyword and priority cookie. diff --git a/lisp/org-agenda.el b/lisp/org-agenda.el index b56c645f6..604dfd3d9 100644 --- a/lisp/org-agenda.el +++ b/lisp/org-agenda.el @@ -3428,7 +3428,8 @@ the documentation of `org-diary'." (funcall (nth 1 org-agenda-deadline-leaders) diff date) (format (nth 1 org-agenda-deadline-leaders) diff))) - head category tags timestr)))) + head category tags + (if (not (= diff 0)) nil timestr))))) (setq txt org-agenda-no-heading-message)) (when txt (setq face (org-agenda-deadline-face dfrac wdays)) @@ -3511,7 +3512,8 @@ FRACTION is what fraction of the head-warning time has passed." (car org-agenda-scheduled-leaders) (format (nth 1 org-agenda-scheduled-leaders) (- 1 diff))) - head category tags timestr)))) + head category tags + (if (not (= diff 0)) nil timestr))))) (setq txt org-agenda-no-heading-message)) (when txt (setq face -- 2.11.4.GIT