mirrors/org-mode
0
0
Fork 1
mirror of https://git.savannah.gnu.org/git/emacs/org-mode.git synced 2024-07-17 03:36:27 +00:00
Code Releases Activity

Revert "* lisp/org-agenda.el (org-agenda-get-deadlines):"

Browse source 
This reverts commit 14b689946d.

See discussion in

   http://thread.gmane.org/gmane.emacs.orgmode/26154/focus=26400
This commit is contained in:
Carsten Dominik 2010-06-21 15:18:36 +02:00
parent af90fb1e4c
commit eade8e6fa3
2 changed files with 6 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
lisp/org-agenda.el
View file

@ -4573,7 +4573,7 @@ be skipped."
pos (1- (match-beginning 1)) pos (1- (match-beginning 1))
d2 (org-time-string-to-absolute d2 (org-time-string-to-absolute
(match-string 1) d1 'past (match-string 1) d1 'past
org-agenda-repeating-timestamp-show-all t) org-agenda-repeating-timestamp-show-all)
diff (- d2 d1) diff (- d2 d1)
wdays (if suppress-prewarning wdays (if suppress-prewarning
(let ((org-deadline-warning-days 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)) pos (1- (match-beginning 1))
d2 (org-time-string-to-absolute d2 (org-time-string-to-absolute
(match-string 1) d1 'past (match-string 1) d1 'past
org-agenda-repeating-timestamp-show-all t) org-agenda-repeating-timestamp-show-all)
diff (- d2 d1)) diff (- d2 d1))
(setq pastschedp (and todayp (< diff 0))) (setq pastschedp (and todayp (< diff 0)))
;; When to show a scheduled item in the calendar: ;; When to show a scheduled item in the calendar:

10
lisp/org.el
View file

@ -14682,20 +14682,18 @@ days in order to avoid rounding problems."
(defun org-time-string-to-seconds (s) (defun org-time-string-to-seconds (s)
(org-float-time (org-time-string-to-time 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. "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. DAYNR.
PREFER and SHOW-ALL are passed through to `org-closest-date'. PREFER and SHOW-ALL are passed through to `org-closest-date'.
the variable date is bound by the calendar when this is called. 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."
(cond (cond
((and daynr (string-match "\\`%%\\((.*)\\)" s)) ((and daynr (string-match "\\`%%\\((.*)\\)" s))
(if (org-diary-sexp-entry (match-string 1 s) "" date) (if (org-diary-sexp-entry (match-string 1 s) "" date)
daynr daynr
(+ daynr 1000))) (+ 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 (org-closest-date s (if (and (boundp 'daynr) (integerp daynr)) daynr
(time-to-days (current-time))) (match-string 0 s) (time-to-days (current-time))) (match-string 0 s)
prefer show-all)) prefer show-all))