branch: externals/org-modern
commit 7bce289ac6daa4258238c5d796b4572dbaca3733
Author: Daniel Mendler <m...@daniel-mendler.de>
Commit: Daniel Mendler <m...@daniel-mendler.de>
Improve timestamp handling
---
example.org | 4 ++--
org-modern.el | 2 +-
2 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/example.org b/example.org
index 6a9c8cdb02..23bcc5b4aa 100644
--- a/example.org
+++ b/example.org
@@ -29,8 +29,8 @@ DRANGE: [2022-03-01]--[2022-04-01]
DRANGE: <2022-03-01>--<2022-04-01>
TRANGE: [2022-03-01 Tue 10:42-11:00]
TIMESTAMP: [2022-02-21 Mon 13:00]
-DREPEATED: <2022-02-26 Sat .+1d +3d>
-TREPEATED: <2022-02-26 Sat 10:00 .+1d>
+DREPEATED: <2022-02-26 Sat .+1d/2d +3d>
+TREPEATED: <2022-02-26 Sat 10:00 .+1d/2d>
* Blocks
diff --git a/org-modern.el b/org-modern.el
index 034efc9af2..7fdfecfdf7 100644
--- a/org-modern.el
+++ b/org-modern.el
@@ -485,7 +485,7 @@ Set to nil to disable the indicator."
(when org-modern-tag
'(("^\\*+.*?\\( \\)\\(:.*:\\)[ \t]*$" (0 (org-modern--tag)))))
(when org-modern-timestamp
- '(("\\(?:<\\|\\[\\)\\([0-9]\\{4\\}-[0-9]\\{2\\}-[0-9]\\{2\\}\\(?:
[[:word:]]+\\)?\\(?: [.+-]+[0-9]+[[:word:]]\\)*\\)\\(\\(?: [0-9:-]+\\)?\\(?:
[.+-]+[0-9]+[[:word:]]\\)*\\)\\(?:>\\|\\]\\)"
+ '(("\\(?:<\\|\\[\\)\\([0-9]\\{4\\}-[0-9]\\{2\\}-[0-9]\\{2\\}\\(?:
[[:word:]]+\\)?\\(?: [.+-]+[0-9ymwdh/]+\\)*\\)\\(\\(?: [0-9:-]+\\)?\\(?:
[.+-]+[0-9ymwdh/]+\\)*\\)\\(?:>\\|\\]\\)"
(0 (org-modern--timestamp)))
("<[^>]+>\\(-\\)\\(-\\)<[^>]+>\\|\\[[^]]+\\]\\(?1:-\\)\\(?2:-\\)\\[[^]]+\\]"
(1 '(face org-modern-label display #(" " 1 2 (face
(:strike-through t) cursor t))) t)
