From eade8e6fa3450e2eddcd8b4491f1f40fd3ba1ac9 Mon Sep 17 00:00:00 2001 From: Carsten Dominik Date: Mon, 21 Jun 2010 15:18:36 +0200 Subject: [PATCH] Revert "* lisp/org-agenda.el (org-agenda-get-deadlines):" This reverts commit 14b689946d398d352f7157bed8a1aa1e31a9e934. See discussion in http://thread.gmane.org/gmane.emacs.orgmode/26154/focus=26400 --- lisp/org-agenda.el | 4 ++-- lisp/org.el | 10 ++++------ 2 files changed, 6 insertions(+), 8 deletions(-) diff --git a/lisp/org-agenda.el b/lisp/org-agenda.el index 1977b8416..93334b696 100644 --- a/lisp/org-agenda.el +++ b/lisp/org-agenda.el @@ -4573,7 +4573,7 @@ be skipped." pos (1- (match-beginning 1)) d2 (org-time-string-to-absolute (match-string 1) d1 'past - org-agenda-repeating-timestamp-show-all t) + org-agenda-repeating-timestamp-show-all) diff (- d2 d1) wdays (if suppress-prewarning (let ((org-deadline-warning-days suppress-prewarning)) @@ -4675,7 +4675,7 @@ FRACTION is what fraction of the head-warning time has passed." pos (1- (match-beginning 1)) d2 (org-time-string-to-absolute (match-string 1) d1 'past - org-agenda-repeating-timestamp-show-all t) + org-agenda-repeating-timestamp-show-all) diff (- d2 d1)) (setq pastschedp (and todayp (< diff 0))) ;; When to show a scheduled item in the calendar: diff --git a/lisp/org.el b/lisp/org.el index e25194c91..19b2b1d6e 100755 --- a/lisp/org.el +++ b/lisp/org.el @@ -14682,20 +14682,18 @@ days in order to avoid rounding problems." (defun org-time-string-to-seconds (s) (org-float-time (org-time-string-to-time s))) -(defun org-time-string-to-absolute (s &optional daynr prefer show-all ignore-cyclic) +(defun org-time-string-to-absolute (s &optional daynr prefer show-all) "Convert a time stamp to an absolute day number. -If there is a specifier for a cyclic time stamp, get the closest date to +If there is a specifyer for a cyclic time stamp, get the closest date to DAYNR. PREFER and SHOW-ALL are passed through to `org-closest-date'. -the variable date is bound by the calendar when this is called. -IGNORE-CYCLIC ignores cyclic repeaters so the returned absolute date -is based on the original date." +the variable date is bound by the calendar when this is called." (cond ((and daynr (string-match "\\`%%\\((.*)\\)" s)) (if (org-diary-sexp-entry (match-string 1 s) "" date) daynr (+ daynr 1000))) - ((and (not ignore-cyclic) daynr (string-match "\\+[0-9]+[dwmy]" s)) + ((and daynr (string-match "\\+[0-9]+[dwmy]" s)) (org-closest-date s (if (and (boundp 'daynr) (integerp daynr)) daynr (time-to-days (current-time))) (match-string 0 s) prefer show-all))