Compare commits

..

1 Commits

Author SHA1 Message Date
620c1f6d8d
Warn of missing customization for grep.el on Windows 2024-07-28 16:10:19 +02:00
2 changed files with 7 additions and 27 deletions

10
init.el
View File

@ -3175,14 +3175,10 @@ eventuelly be set to nil, however)."
;; Warn of Windows pecularitites
(when on-windows
;; Warn if `grep-find-template' or `grep-find-command' are undefined in `grep.el', because then
;; they would be set by `grep-compute-defaults', which in turn uses `find-program', which is set
;; to "find", which on Windows might be CMD's FIND, which does something else (it's more akin to
;; grep).
;; Warn if `find-program' in `grep.el' is the default, because this might be the CMD's FIND.
(when (and (require 'grep nil t)
(or (null grep-find-template)
(null grep-find-command)))
(warn (concat "`grep-find-template' or `grep-find-command' are undefined, please customize these to use the right version of `find'"))))
(string= find-program "find"))
(warn (concat "`find-program' points to \"find\", which might be CMD's FIND; please customize this variable to point to an implementation of GNU find instead"))))
;; Load custom code

View File

@ -708,17 +708,7 @@ PARAMS is a property list of the following parameters:
`:org-ql-match'
`org-ql' expression (in sexp syntax) to filter the list of
tasks to consider. Defaults to (todo).
`:skip-matches'
Regular expression to skip certain interval end dates that are
not of interest. The regular expression will be matched
against the formatted timestamp. For example, to skip
weekends, use \"Sat\\|Sun\" as regular expression.
This can also be a function taking a formatted timestamp as
argument and returning non-nil when the date should be skipped."
tasks to consider. Defaults to (todo)."
(let* ((start-date (org-read-date t t
(or (plist-get params :start-date)
"00:00")))
@ -730,12 +720,6 @@ PARAMS is a property list of the following parameters:
(org-ql-match (or (plist-get params :org-ql-match)
'(todo)))
(timestamp-format "%Y-%m-%d %a %H:%M")
(skipper (pcase (plist-get params :skip-matches)
((pred null) #'(lambda (_) nil))
((and (pred stringp) arg)
#'(lambda (x) (string-match arg x)))
((and (pred functionp) fun) fun)
(_ (user-error "Invalid argument to :skip-matches: %s" arg))))
date-range)
;; Check input
@ -774,9 +758,9 @@ PARAMS is a property list of the following parameters:
nil
(format-time-string timestamp-format interval-end-date)
org-ql-match))))
(let ((interval-end-date (format-time-string timestamp-format interval-end-date)))
(unless (funcall skipper interval-end-date)
(insert (format "| [%s] | %s |\n" interval-end-date total-time))))))
(insert (format "| [%s] | %s |\n"
(format-time-string timestamp-format interval-end-date)
total-time))))
(insert "|--|")
(org-table-align)))