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:
Ihor Radchenko 2023-01-21 11:20:50 +03:00
parent 84ead47d3c
commit f2320a2cc1
No known key found for this signature in database
GPG Key ID: 6470762A7DA11D8B
1 changed files with 7 additions and 13 deletions

View File

@ -7147,19 +7147,13 @@ scheduled items with an hour specification like [h]h:mm."
'effort effort
'effort-minutes effort-minutes)
level category tags
(save-match-data
(let ((hhmm1 (and (string-match org-ts-regexp1 s1)
(match-string 6 s1)))
(hhmm2 (and (string-match org-ts-regexp1 s2)
(match-string 6 s2))))
(cond ((string= hhmm1 hhmm2)
(concat "<" start-time ">--<" end-time ">"))
((and (= d1 d0) (= d2 d0))
(concat "<" start-time ">--<" end-time ">"))
((= d1 d0)
(concat "<" start-time ">"))
((= d2 d0)
(concat "<" end-time ">")))))
(cond
((and (= d1 d0) (= d2 d0))
(concat "<" start-time ">--<" end-time ">"))
((= d1 d0)
(concat "<" start-time ">"))
((= d2 d0)
(concat "<" end-time ">")))
remove-re))))
(org-add-props txt props
'face face