|
@@ -14682,20 +14682,18 @@ days in order to avoid rounding problems."
|
|
|
(defun org-time-string-to-seconds (s)
|
|
|
(org-float-time (org-time-string-to-time s)))
|
|
|
|
|
|
-(defun org-time-string-to-absolute (s &optional daynr prefer show-all ignore-cyclic)
|
|
|
+(defun org-time-string-to-absolute (s &optional daynr prefer show-all)
|
|
|
"Convert a time stamp to an absolute day number.
|
|
|
-If there is a specifier for a cyclic time stamp, get the closest date to
|
|
|
+If there is a specifyer for a cyclic time stamp, get the closest date to
|
|
|
DAYNR.
|
|
|
PREFER and SHOW-ALL are passed through to `org-closest-date'.
|
|
|
-the variable date is bound by the calendar when this is called.
|
|
|
-IGNORE-CYCLIC ignores cyclic repeaters so the returned absolute date
|
|
|
-is based on the original date."
|
|
|
+the variable date is bound by the calendar when this is called."
|
|
|
(cond
|
|
|
((and daynr (string-match "\\`%%\\((.*)\\)" s))
|
|
|
(if (org-diary-sexp-entry (match-string 1 s) "" date)
|
|
|
daynr
|
|
|
(+ daynr 1000)))
|
|
|
- ((and (not ignore-cyclic) daynr (string-match "\\+[0-9]+[dwmy]" s))
|
|
|
+ ((and daynr (string-match "\\+[0-9]+[dwmy]" s))
|
|
|
(org-closest-date s (if (and (boundp 'daynr) (integerp daynr)) daynr
|
|
|
(time-to-days (current-time))) (match-string 0 s)
|
|
|
prefer show-all))
|