[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[elpa] externals/org 9a72074: Merge branch 'maint'
From: |
ELPA Syncer |
Subject: |
[elpa] externals/org 9a72074: Merge branch 'maint' |
Date: |
Mon, 10 May 2021 12:57:13 -0400 (EDT) |
branch: externals/org
commit 9a7207404cc68be413acfe8f7d60dd1280bb1d16
Merge: 981f250 6107c2b
Author: Nicolas Goaziou <mail@nicolasgoaziou.fr>
Commit: Nicolas Goaziou <mail@nicolasgoaziou.fr>
Merge branch 'maint'
---
lisp/org-agenda.el | 9 ++++-----
1 file changed, 4 insertions(+), 5 deletions(-)
diff --git a/lisp/org-agenda.el b/lisp/org-agenda.el
index 3477fba..85e2010 100644
--- a/lisp/org-agenda.el
+++ b/lisp/org-agenda.el
@@ -6739,6 +6739,9 @@ Any match of REMOVE-RE will be removed from TXT."
(= (match-beginning 0) 0)
t))
(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
;; `org-agenda-default-appointment-duration' are set
@@ -6752,11 +6755,7 @@ Any match of REMOVE-RE will be removed from TXT."
;; Compute the duration
(when s2
(setq duration (- (org-duration-to-minutes s2)
- (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))))
+ (org-duration-to-minutes s1)))))
(when (string-match org-tag-group-re txt)
;; Tags are in the string