forked from mirrors/org-mode
Revert "org-agenda.el: Fix `org-agenda-get-blocks'"
This reverts commit cb19f5c94e
.
The original commit broke timestamp ranges with same starting and
ending hours.
Link: https://orgmode.org/list/87edrpa15m.fsf@gnu.org
This commit is contained in:
parent
84ead47d3c
commit
f2320a2cc1
|
@ -7147,19 +7147,13 @@ scheduled items with an hour specification like [h]h:mm."
|
||||||
'effort effort
|
'effort effort
|
||||||
'effort-minutes effort-minutes)
|
'effort-minutes effort-minutes)
|
||||||
level category tags
|
level category tags
|
||||||
(save-match-data
|
(cond
|
||||||
(let ((hhmm1 (and (string-match org-ts-regexp1 s1)
|
((and (= d1 d0) (= d2 d0))
|
||||||
(match-string 6 s1)))
|
(concat "<" start-time ">--<" end-time ">"))
|
||||||
(hhmm2 (and (string-match org-ts-regexp1 s2)
|
((= d1 d0)
|
||||||
(match-string 6 s2))))
|
(concat "<" start-time ">"))
|
||||||
(cond ((string= hhmm1 hhmm2)
|
((= d2 d0)
|
||||||
(concat "<" start-time ">--<" end-time ">"))
|
(concat "<" end-time ">")))
|
||||||
((and (= d1 d0) (= d2 d0))
|
|
||||||
(concat "<" start-time ">--<" end-time ">"))
|
|
||||||
((= d1 d0)
|
|
||||||
(concat "<" start-time ">"))
|
|
||||||
((= d2 d0)
|
|
||||||
(concat "<" end-time ">")))))
|
|
||||||
remove-re))))
|
remove-re))))
|
||||||
(org-add-props txt props
|
(org-add-props txt props
|
||||||
'face face
|
'face face
|
||||||
|
|
Loading…
Reference in New Issue