Björn Kettunen <[email protected]> writes: >>> You can first form a full list of files via org-add-archive-files (if >>> needed) in org-dblock-write:clocktable. > > So basically adding the archive files twice, once in > org-dblock-write:clocktable and then in > org-clock-get-table-data-with-archives?
Nope. You can change org-clock-get-table-data-with-archives to just accept a list of files to merge (archives or not). Then you can call org-add-archive-files once in org-dblock-write:clocktable and the reuse the value. > Regarding the when-let in org-clock-merge-table-data. Does it make a > difference performance wise to append and entry which might be nil vs > appending only if a new entry would not be nil? I do not think that there will be much difference here. > Below the updated patch, plus the other change to make the git hook > install work if org mode is a git submodule working. Thanks! Comments inline. > +*** New function ~org-clock-merge-table-data~ > + > +Takes a list of clocktable data tables, merge them all > +under file or the file name of the first table. I think that this new function is not important enough for all Org users to care. No need to put it into the news. Agenda one is more important - I have seen a number of questions that would require something similar. > +(defun org-clock--get-table-data1 (file params) > + "Get clocktable-data for FILE with PARAMS." This docstring is a bit confusing. Maybe you can provide more details about what the function does. > Subject: [PATCH 2/2] * mk/targets.mk (GIT_HOOKS): Resolve correctly when in > submodule > ... > -GITDIR = .git/hooks > -GITHOOKS = $(notdir $(wildcard git-hooks/*)) > +GITDIR = $(shell git rev-parse --git-path hooks) > +GITHOOKS = $(notdir $(wildcard $(GITDIR)/git-hooks/*)) You set GITHOOKS to .git/hooks/git-hooks/*, while it should simply be $ROOT/git-hooks/* -- Ihor Radchenko // yantar92, Org mode maintainer, Learn more about Org mode at <https://orgmode.org/>. Support Org development at <https://liberapay.com/org-mode>, or support my work at <https://liberapay.com/yantar92>
