[elpa] externals/org 6f1ea80: Merge branch 'maint'

[ELPA Syncer]

branch: externals/org
commit 6f1ea80bbd0fbd7c479a0cfce2328bb111f8df3d
Merge: 2ae3083 bc857bf
Author: Nicolas Goaziou <mail@nicolasgoaziou.fr>
Commit: Nicolas Goaziou <mail@nicolasgoaziou.fr>

    Merge branch 'maint'
---
 lisp/org-agenda.el | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/lisp/org-agenda.el b/lisp/org-agenda.el
index 85e2010..3477fba 100644
--- a/lisp/org-agenda.el
+++ b/lisp/org-agenda.el
@@ -6739,9 +6739,6 @@ 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
@@ -6755,7 +6752,11 @@ 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)))))
+                             (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)
          ;; Tags are in the string