ndwarshuis
/
org-mode
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

org-agenda: Fix previous commit 

* lisp/org-agenda.el (org-agenda-get-timestamps):
(org-agenda-get-deadlines): Apply `org-agenda--timestamp-to-absolute'
signature change.
This commit is contained in:
Nicolas Goaziou 2016-11-25 02:07:54 +01:00
parent 69ec6258b6
commit 26828778c6
1 changed files with 5 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
lisp/org-agenda.el
View File

@ -5631,8 +5631,7 @@ This function is invoked if `org-agenda-todo-ignore-deadlines',
(org-agenda-skip) (org-agenda-skip)
(if (and (match-end 1) (if (and (match-end 1)
(not (= d1 (org-agenda--timestamp-to-absolute (not (= d1 (org-agenda--timestamp-to-absolute
(match-string 1) d1 nil show-all (match-string 1) d1 nil (current-buffer) b0))))
(current-buffer) b0))))
(throw :skip nil)) (throw :skip nil))
(if (and e3 (if (and e3
(not (org-diary-sexp-entry (buffer-substring b3 e3) "" date))) (not (org-diary-sexp-entry (buffer-substring b3 e3) "" date)))
@ -6056,7 +6055,7 @@ specification like [h]h:mm."
;; LAST-REPEAT is the repeat closest to CURRENT. ;; LAST-REPEAT is the repeat closest to CURRENT.
;; Otherwise, LAST-REPEAT is equal to DEADLINE. ;; Otherwise, LAST-REPEAT is equal to DEADLINE.
(last-repeat (org-agenda--timestamp-to-absolute (last-repeat (org-agenda--timestamp-to-absolute
s current 'past show-all (current-buffer) pos)) s current 'past (current-buffer) pos))
(deadline (org-agenda--timestamp-to-absolute s current)) (deadline (org-agenda--timestamp-to-absolute s current))
(diff (- last-repeat current)) (diff (- last-repeat current))
(suppress-prewarning (suppress-prewarning
@ -6075,7 +6074,7 @@ specification like [h]h:mm."
;; Set pre-warning to no earlier than SCHEDULED. ;; Set pre-warning to no earlier than SCHEDULED.
(min (- last-repeat (min (- last-repeat
(org-agenda--timestamp-to-absolute (org-agenda--timestamp-to-absolute
scheduled current 'past show-all scheduled current 'past
(current-buffer) (current-buffer)
(save-excursion (save-excursion
(beginning-of-line) (beginning-of-line)