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 2015-08-10 22:36:02 +02:00
parent caf762e9bc aa98f7c79a
commit e658b07c8a
1 changed files with 20 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
lisp/org.el
View File

@ -13147,7 +13147,14 @@ Returns the new TODO keyword, or nil if no state change should occur."
(match-string 2)))) (match-string 2))))
(defun org-at-date-range-p (&optional inactive-ok) (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) (interactive)
(save-excursion (save-excursion
(catch 'exit (catch 'exit
@ -16631,13 +16638,10 @@ with the current time without prompting the user.
When called from lisp, the timestamp is inactive if INACTIVE is When called from lisp, the timestamp is inactive if INACTIVE is
non-nil." non-nil."
(interactive "P") (interactive "P")
(let* ((ts (let* ((ts (cond
(cond ((org-at-date-range-p t) ((org-at-date-range-p t)
(save-excursion (match-string (if (< (point) (- (match-beginning 2) 2)) 1 2)))
(goto-char (match-beginning 0)) ((org-at-timestamp-p t) (match-string 0))))
(looking-at (if inactive org-ts-regexp-both org-ts-regexp)))
(match-string 0))
((org-at-timestamp-p t) (match-string 0))))
;; Default time is either the timestamp at point or today. ;; Default time is either the timestamp at point or today.
;; When entering a range, only the range start is considered. ;; When entering a range, only the range start is considered.
(default-time (if (not ts) (current-time) (default-time (if (not ts) (current-time)
@ -17864,7 +17868,14 @@ With prefix ARG, change that many days."
(org-timestamp-change (- (prefix-numeric-value arg)) 'day) 'updown)) (org-timestamp-change (- (prefix-numeric-value arg)) 'day) 'updown))
(defun org-at-timestamp-p (&optional inactive-ok) (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) (interactive)
(let* ((tsr (if inactive-ok org-ts-regexp3 org-ts-regexp2)) (let* ((tsr (if inactive-ok org-ts-regexp3 org-ts-regexp2))
(pos (point)) (pos (point))