[elpa] externals/org 8f03cd7: Merge branch 'maint'

[ELPA Syncer]

branch: externals/org
commit 8f03cd72903ecd837e970066a1fddd3627709e30
Merge: 9a72074 c26f8d2
Author: Nicolas Goaziou <mail@nicolasgoaziou.fr>
Commit: Nicolas Goaziou <mail@nicolasgoaziou.fr>

    Merge branch 'maint'
---
 lisp/org-agenda.el | 11 ++++-------
 lisp/org.el        |  2 +-
 2 files changed, 5 insertions(+), 8 deletions(-)

diff --git a/lisp/org-agenda.el b/lisp/org-agenda.el
index 85e2010..cbae3c0 100644
--- a/lisp/org-agenda.el
+++ b/lisp/org-agenda.el
@@ -6739,10 +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
          (when (and s1 (not s2) org-agenda-default-appointment-duration)
@@ -6751,12 +6747,13 @@ Any match of REMOVE-RE will be removed from TXT."
                   (+ (org-duration-to-minutes s1 t)
                      org-agenda-default-appointment-duration)
                   nil t)))
-
          ;; 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
          (if (or (eq org-agenda-remove-tags t)
diff --git a/lisp/org.el b/lisp/org.el
index 8940106..b388bca 100644
--- a/lisp/org.el
+++ b/lisp/org.el
@@ -4117,7 +4117,7 @@ groups carry important information:
 (defconst org-stamp-time-of-day-regexp
   (concat
    "<\\([0-9]\\{4\\}-[0-9]\\{2\\}-[0-9]\\{2\\} +\\sw+ +\\)"
-   "\\([012][0-9]:[0-5][0-9]\\(-\\([012][0-9]:[0-5][0-9]\\)\\)?[^\n\r>]*?\\)>"
+   "\\([012][0-9]:[0-5][0-9]\\)\\(-\\([012][0-9]:[0-5][0-9]\\)\\)?[^\n\r>]*?>"
    "\\(--?"
    "<\\1\\([012][0-9]:[0-5][0-9]\\)>\\)?")
   "Regular expression to match a timestamp time or time range.