Merge branch 'maint'
This commit is contained in:
commit
e658b07c8a
27
lisp/org.el
27
lisp/org.el
|
@ -13147,7 +13147,14 @@ Returns the new TODO keyword, or nil if no state change should occur."
|
|||
(match-string 2))))
|
||||
|
||||
(defun org-at-date-range-p (&optional inactive-ok)
|
||||
"Is the cursor inside a date range?"
|
||||
"Non-nil if point is inside a date range.
|
||||
|
||||
When optional argument INACTIVE-OK is non-nil, also consider
|
||||
inactive time ranges.
|
||||
|
||||
When this function returns a non-nil value, match data is set
|
||||
according to `org-tr-regexp-both' or `org-tr-regexp', depending
|
||||
on INACTIVE-OK."
|
||||
(interactive)
|
||||
(save-excursion
|
||||
(catch 'exit
|
||||
|
@ -16631,12 +16638,9 @@ with the current time without prompting the user.
|
|||
When called from lisp, the timestamp is inactive if INACTIVE is
|
||||
non-nil."
|
||||
(interactive "P")
|
||||
(let* ((ts
|
||||
(cond ((org-at-date-range-p t)
|
||||
(save-excursion
|
||||
(goto-char (match-beginning 0))
|
||||
(looking-at (if inactive org-ts-regexp-both org-ts-regexp)))
|
||||
(match-string 0))
|
||||
(let* ((ts (cond
|
||||
((org-at-date-range-p t)
|
||||
(match-string (if (< (point) (- (match-beginning 2) 2)) 1 2)))
|
||||
((org-at-timestamp-p t) (match-string 0))))
|
||||
;; Default time is either the timestamp at point or today.
|
||||
;; When entering a range, only the range start is considered.
|
||||
|
@ -17864,7 +17868,14 @@ With prefix ARG, change that many days."
|
|||
(org-timestamp-change (- (prefix-numeric-value arg)) 'day) 'updown))
|
||||
|
||||
(defun org-at-timestamp-p (&optional inactive-ok)
|
||||
"Determine if the cursor is in or at a timestamp."
|
||||
"Non-nil if point is inside a timestamp.
|
||||
|
||||
When optional argument INACTIVE-OK is non-nil, also consider
|
||||
inactive timestamps.
|
||||
|
||||
When this function returns a non-nil value, match data is set
|
||||
according to `org-ts-regexp3' or `org-ts-regexp2', depending on
|
||||
INACTIVE-OK."
|
||||
(interactive)
|
||||
(let* ((tsr (if inactive-ok org-ts-regexp3 org-ts-regexp2))
|
||||
(pos (point))
|
||||
|
|
Loading…
Reference in New Issue