[elpa] externals/org-modern 89875c58c0: Disable timestamp formatting if org-display-custom-times is non-nil (Fix #29)

[ELPA Syncer]

branch: externals/org-modern
commit 89875c58c0ce5eb4cc3747dbba7b98b435229029
Author: Daniel Mendler <mail@daniel-mendler.de>
Commit: Daniel Mendler <mail@daniel-mendler.de>

    Disable timestamp formatting if org-display-custom-times is non-nil (Fix 
#29)
---
 org-modern.el | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/org-modern.el b/org-modern.el
index 49e6a1745b..094a559f95 100644
--- a/org-modern.el
+++ b/org-modern.el
@@ -511,7 +511,7 @@ You can specify a font `:family'. The font families 
`Iosevka', `Hack' and
            (2 'org-modern-block-keyword append))))
       (when org-modern-tag
         '(("^\\*+.*?\\( \\)\\(:.*:\\)[ \t]*$" (0 (org-modern--tag)))))
-      (when org-modern-timestamp
+      (when (and org-modern-timestamp (not org-display-custom-times))
         '(("\\(?:<\\|\\[\\)\\([0-9]\\{4\\}-[0-9]\\{2\\}-[0-9]\\{2\\}\\(?: 
[[:word:]]+\\)?\\(?: [.+-]+[0-9ymwdh/]+\\)*\\)\\(\\(?: [0-9:-]+\\)?\\(?: 
[.+-]+[0-9ymwdh/]+\\)*\\)\\(?:>\\|\\]\\)"
            (0 (org-modern--timestamp)))
           
("<[^>]+>\\(-\\)\\(-\\)<[^>]+>\\|\\[[^]]+\\]\\(?1:-\\)\\(?2:-\\)\\[[^]]+\\]"