contrapunctus
/
chronometrist
Archived
1
3
Fork 0
Code Issues 1 Pull Requests Projects Releases Wiki Activity

Merge branch 'dev'

This commit is contained in:
contrapunctus 2021-01-07 03:14:26 +05:30
parent 108cd37644 a7bb7dbcca
commit 0dc3db8f24
4 changed files with 20 additions and 46 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
doc/manual.info
View File

@ -885,8 +885,6 @@ Function - chronometrist-value-history-populate (history-table file)
@item
Function - chronometrist-tags-history-add (plist)
@item
Function - chronometrist-tags-history-replace-last (plist)
@item
Function - chronometrist-tags-history-combination-strings (task)
@item
Function - chronometrist-tags-history-individual-strings (task)

41
doc/manual.org
View File

@ -369,27 +369,26 @@ Each of these has a corresponding function to clear it and fill it with values -
10. Function - chronometrist-key-history-populate (task history-table file)
11. Function - chronometrist-value-history-populate (history-table file)
12. Function - chronometrist-tags-history-add (plist)
13. Function - chronometrist-tags-history-replace-last (plist)
14. Function - chronometrist-tags-history-combination-strings (task)
15. Function - chronometrist-tags-history-individual-strings (task)
16. Function - chronometrist-tags-prompt (task &optional initial-input)
17. Function - chronometrist-tags-add (&rest args)
18. Custom Variable - chronometrist-kv-buffer-name
19. Variable - chronometrist-key-history
20. Variable - chronometrist-value-history
21. Keymap - chronometrist-kv-read-mode-map
22. Major Mode - chronometrist-kv-read-mode
23. Function - chronometrist-kv-completion-quit-key ()
24. Function - chronometrist-string-has-whitespace-p (string)
25. Function - chronometrist-key-prompt (used-keys)
26. Function - chronometrist-value-prompt (key)
27. Function - chronometrist-value-insert (value)
28. Function - chronometrist-kv-add (&rest args)
29. Command - chronometrist-kv-accept ()
30. Command - chronometrist-kv-reject ()
31. Internal Variable - chronometrist--skip-detail-prompts
32. Function - chronometrist-skip-query-prompt (task)
33. Function - chronometrist-skip-query-reset (_task)
13. Function - chronometrist-tags-history-combination-strings (task)
14. Function - chronometrist-tags-history-individual-strings (task)
15. Function - chronometrist-tags-prompt (task &optional initial-input)
16. Function - chronometrist-tags-add (&rest args)
17. Custom Variable - chronometrist-kv-buffer-name
18. Variable - chronometrist-key-history
19. Variable - chronometrist-value-history
20. Keymap - chronometrist-kv-read-mode-map
21. Major Mode - chronometrist-kv-read-mode
22. Function - chronometrist-kv-completion-quit-key ()
23. Function - chronometrist-string-has-whitespace-p (string)
24. Function - chronometrist-key-prompt (used-keys)
25. Function - chronometrist-value-prompt (key)
26. Function - chronometrist-value-insert (value)
27. Function - chronometrist-kv-add (&rest args)
28. Command - chronometrist-kv-accept ()
29. Command - chronometrist-kv-reject ()
30. Internal Variable - chronometrist--skip-detail-prompts
31. Function - chronometrist-skip-query-prompt (task)
32. Function - chronometrist-skip-query-reset (_task)
** chronometrist-statistics-custom.el
1. Custom variable - chronometrist-statistics-buffer-name

13
elisp/chronometrist-key-values.el
View File

@ -182,19 +182,6 @@ HISTORY-TABLE must be a hash table. (see `chronometrist-value-history')"
(--> (append tags old-tags)
(puthash name it table)))))
(defun chronometrist-tags-history-replace-last (plist)
"Replace the latest tag combination for PLIST's task with tags from PLIST."
(let* ((table chronometrist-tags-history)
(name (plist-get plist :name))
(tags (awhen (plist-get plist :tags) (list it)))
(old-tags (gethash name table)))
(when tags
(if old-tags
(--> (cdr old-tags)
(append tags it)
(puthash name it table))
(puthash name tags table)))))
(defun chronometrist-tags-history-combination-strings (task)
"Return list of past tag combinations for TASK.
Each combination is a string, with tags separated by commas.

10
elisp/chronometrist-sexp.el
View File

@ -117,16 +117,6 @@ were none."
(backward-list 1)
(chronometrist-sexp-delete-list)
(funcall chronometrist-sexp-pretty-print-function plist (current-buffer))
;; We assume here that this function will always be used to
;; replace something with the same :name. At the time of writing,
;; this is indeed the case. The reason for this is that if the
;; replaced plist is the only one in `chronometrist-file' with that :name, the
;; :name should be removed from `chronometrist-task-list', but to ascertain
;; that condition we would have to either read the entire file or
;; map over the hash table, defeating the optimization. Thus, we
;; don't update `chronometrist-task-list' here (unlike `chronometrist-sexp-new')
(chronometrist-tags-history-replace-last plist)
(setq chronometrist--inhibit-read-p t)
(save-buffer)))
(defun chronometrist-sexp-reindent-buffer ()