[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[elpa] externals/org bebf0bd42d: Merge branch 'bugfix'
From: |
ELPA Syncer |
Subject: |
[elpa] externals/org bebf0bd42d: Merge branch 'bugfix' |
Date: |
Mon, 18 Apr 2022 10:57:41 -0400 (EDT) |
branch: externals/org
commit bebf0bd42df56d6b5ab5b1a9190399b9ff2fe3b1
Merge: 0ea476ad75 1f617727f1
Author: Ihor Radchenko <yantar92@gmail.com>
Commit: Ihor Radchenko <yantar92@gmail.com>
Merge branch 'bugfix'
---
lisp/org.el | 24 ++++++++++++++----------
1 file changed, 14 insertions(+), 10 deletions(-)
diff --git a/lisp/org.el b/lisp/org.el
index 2f6406a8d5..2353c6594f 100644
--- a/lisp/org.el
+++ b/lisp/org.el
@@ -15249,20 +15249,24 @@ value is equivalent to `inactive'.
When at a timestamp, return the position of the point as a symbol
among `bracket', `after', `year', `month', `hour', `minute',
`day' or a number of character from the last know part of the
-time stamp.
+time stamp. If diary sexp timestamps, any point inside the timestamp
+is considered `day' (i.e. only `bracket', `day', and `after' return
+values are possible).
When matching, the match groups are the following:
- group 1: year
- group 2: month
- group 3: day number
- group 4: day name
+ group 1: year, if any
+ group 2: month, if any
+ group 3: day number, if any
+ group 4: day name, if any
group 5: hours, if any
group 6: minutes, if any"
- (let* ((regexp (if extended
- (if (eq extended 'agenda)
- org-element--timestamp-regexp
- org-ts-regexp3)
- org-ts-regexp2))
+ (let* ((regexp
+ (if extended
+ (if (eq extended 'agenda)
+ (rx (or (regexp org-ts-regexp3)
+ (regexp org-element--timestamp-regexp)))
+ org-ts-regexp3)
+ org-ts-regexp2))
(pos (point))
(match?
(let ((boundaries (org-in-regexp regexp)))