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

Revert "agenda: Fix "org-duration-to-minutes: Invalid duration format" error" 

This reverts commit bc857bfc62.

The "fix" breaks elsewhere, as reported below.

Reported-by: Daniel Ortmann <daniel.ortmann@oracle.com>
<http://lists.gnu.org/r/emacs-orgmode/2021-05/msg00592.html>
This commit is contained in:
Nicolas Goaziou 2021-05-10 18:00:58 +02:00
parent bc857bfc62
commit 6107c2b15b
1 changed files with 4 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
lisp/org-agenda.el
View File

@ -6656,6 +6656,9 @@ Any match of REMOVE-RE will be removed from TXT."
(= (match-beginning 0) 0) (= (match-beginning 0) 0)
t)) t))
(setq txt (replace-match "" nil nil txt)))) (setq txt (replace-match "" nil nil txt))))
;; Normalize the time(s) to 24 hour
(when s1 (setq s1 (org-get-time-of-day s1 'string t)))
(when s2 (setq s2 (org-get-time-of-day s2 'string t)))
;; Try to set s2 if s1 and ;; Try to set s2 if s1 and
;; `org-agenda-default-appointment-duration' are set ;; `org-agenda-default-appointment-duration' are set
@ -6669,11 +6672,7 @@ Any match of REMOVE-RE will be removed from TXT."
;; Compute the duration ;; Compute the duration
(when s2 (when s2
(setq duration (- (org-duration-to-minutes s2) (setq duration (- (org-duration-to-minutes s2)
(org-duration-to-minutes s1)))) (org-duration-to-minutes s1)))))
;; Normalize the time(s) to 24 hour
(when s1 (setq s1 (org-get-time-of-day s1 'string t)))
(when s2 (setq s2 (org-get-time-of-day s2 'string t))))
(when (string-match org-tag-group-re txt) (when (string-match org-tag-group-re txt)
;; Tags are in the string ;; Tags are in the string