Compare commits

..

No commits in common. "d63cba9756c70cf261f0c14c8417e6483959137d" and "bdfcc61dd2796d17041ce4585d2fc29c0db49224" have entirely different histories.

View File

@ -766,12 +766,12 @@ PARAMS is a property list of the following parameters:
(org-ql-match (or (plist-get params :org-ql-match) (org-ql-match (or (plist-get params :org-ql-match)
'(todo))) '(todo)))
(timestamp-format "%Y-%m-%d %a %H:%M") (timestamp-format "%Y-%m-%d %a %H:%M")
(skip-date-p (pcase (plist-get params :skip-matches) (skipper (pcase (plist-get params :skip-matches)
((pred null) #'(lambda (_) nil)) ((pred null) #'(lambda (_) nil))
((and (pred stringp) arg) ((and (pred stringp) arg)
#'(lambda (x) (string-match arg x))) #'(lambda (x) (string-match arg x)))
((and (pred functionp) fun) fun) ((and (pred functionp) fun) fun)
(arg (user-error "Invalid argument to :skip-matches: %s" arg)))) (_ (user-error "Invalid argument to :skip-matches: %s" arg))))
(work-hours (or (plist-get params :work-hours) (work-hours (or (plist-get params :work-hours)
"8:00")) "8:00"))
date-range) date-range)
@ -798,7 +798,7 @@ PARAMS is a property list of the following parameters:
(format "+%s" increment) (format "+%s" increment)
nil current) nil current)
current-formatted (format-time-string timestamp-format current)) current-formatted (format-time-string timestamp-format current))
(unless (funcall skip-date-p current-formatted) (unless (funcall skipper current-formatted)
(push current-formatted date-range)))) (push current-formatted date-range))))
(setq date-range (nreverse (cdr date-range))) (setq date-range (nreverse (cdr date-range)))