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

Merge branch 'maint'

This commit is contained in:
Nicolas Goaziou 2021-05-11 09:40:46 +02:00
parent 9a7207404c c26f8d2cc5
commit 8f03cd7290
2 changed files with 5 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
lisp/org-agenda.el
View File

@ -6739,10 +6739,6 @@ 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
(when (and s1 (not s2) org-agenda-default-appointment-duration) (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-duration-to-minutes s1 t)
org-agenda-default-appointment-duration) org-agenda-default-appointment-duration)
nil t))) nil t)))
;; 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
(if (or (eq org-agenda-remove-tags t) (if (or (eq org-agenda-remove-tags t)

2
lisp/org.el
View File

@ -4117,7 +4117,7 @@ groups carry important information:
(defconst org-stamp-time-of-day-regexp (defconst org-stamp-time-of-day-regexp
(concat (concat
"<\\([0-9]\\{4\\}-[0-9]\\{2\\}-[0-9]\\{2\\} +\\sw+ +\\)" "<\\([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]\\)>\\)?") "<\\1\\([012][0-9]:[0-5][0-9]\\)>\\)?")
"Regular expression to match a timestamp time or time range. "Regular expression to match a timestamp time or time range.