mirrors
/
org-mode
mirror of https://git.savannah.gnu.org/git/emacs/org-mode.git
0
0
Fork 1
Code Releases Activity

Fix 3072cb2 

* lisp/org-agenda.el (org-agenda-get-deadlines):
(org-agenda-get-scheduled): When closest scheduled/deadline date is
today, also report all days since original timestamp.
This commit is contained in:
Nicolas Goaziou 2015-10-26 21:29:12 +01:00
parent 7706714200
commit 9e18583242
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
lisp/org-agenda.el
View File

@ -6137,7 +6137,7 @@ specification like [h]h:mm."
;; For past deadlines, make sure to report ;; For past deadlines, make sure to report
;; time difference since date S, not since ;; time difference since date S, not since
;; closest repeater. ;; closest repeater.
(let ((diff (if (> d1 (org-today)) diff (let ((diff (if (< (org-today) d1) diff
(- (org-time-string-to-absolute s) d1)))) (- (org-time-string-to-absolute s) d1))))
(cond ((= diff 0) dl0) (cond ((= diff 0) dl0)
((> diff 0) ((> diff 0)
@ -6150,7 +6150,7 @@ specification like [h]h:mm."
(format dl2 (if (string= dl2 dl1) (format dl2 (if (string= dl2 dl1)
diff (abs diff))))))) diff (abs diff)))))))
head level category tags head level category tags
(if (not (= diff 0)) nil timestr))))) (and (= diff 0) timestr)))))
(when txt (when txt
(setq face (org-agenda-deadline-face dfrac)) (setq face (org-agenda-deadline-face dfrac))
(org-add-props txt props (org-add-props txt props
@ -6324,13 +6324,13 @@ an hour specification like [h]h:mm."
;; report time difference since date S, not ;; report time difference since date S, not
;; since closest repeater. ;; since closest repeater.
(let ((diff (let ((diff
(if (<= (org-today) d1) diff (if (< (org-today) d1) diff
(- (org-time-string-to-absolute s) d1)))) (- (org-time-string-to-absolute s) d1))))
(if (= diff 0) (car org-agenda-scheduled-leaders) (if (= diff 0) (car org-agenda-scheduled-leaders)
(format (nth 1 org-agenda-scheduled-leaders) (format (nth 1 org-agenda-scheduled-leaders)
(- 1 diff)))) (- 1 diff))))
head level category tags head level category tags
(if (not (= diff 0)) nil timestr) (and (= diff 0) timestr)
nil habitp)))) nil habitp))))
(when txt (when txt
(setq face (setq face