Address nearly all byte compiler warnings

For the time being, we use a consistent pattern of packages requiring
sexp.el instead of the other way round.

chronometrist-current-task has been moved back to chronometrist-common
This commit is contained in:
contrapunctus 2020-05-16 08:35:54 +05:30
parent ea65761ee9
commit 958551d498
6 changed files with 50 additions and 52 deletions

View File

@ -19,11 +19,7 @@
(require 'chronometrist-custom)
(require 'chronometrist-report-custom)
(require 'chronometrist-time)
;; (require 'chronometrist-sexp)
;; (declare-function chronometrist-sexp-open-log "chronometrist-sexp")
;; (declare-function chronometrist-sexp-create-file "chronometrist-sexp")
;; (declare-function chronometrist-sexp-current-task "chronometrist-sexp")
(require 'chronometrist-sexp)
;; ## VARIABLES ##
;;; Code:
@ -53,6 +49,10 @@ must correspond to the output from `chronometrist-format-time'.")
Used to prevent more than one watch being added for the same
file.")
(defun chronometrist-current-task ()
"Return the name of the currently clocked-in task, or nil if not clocked in."
(chronometrist-sexp-current-task))
(defun chronometrist-format-time (duration &optional blank)
"Format DURATION as a string suitable for display in Chronometrist buffers.
DURATION must be a vector or a list of the form [HOURS MINUTES

View File

@ -59,7 +59,6 @@ vectors.\)"
This is not guaranteed to be accurate - see (info \"(elisp)Timers\")."
:type 'integer)
(declare-function chronometrist-format-time "chronometrist-common")
(eval-when-compile (require 'subr-x))
(defcustom chronometrist-activity-indicator "*"

View File

@ -13,6 +13,7 @@
;; (require 'chronometrist-plist-pp)
(require 'chronometrist-common)
(require 'chronometrist-sexp)
;; external -
;; chronometrist-day-start-time (-custom)

View File

@ -4,7 +4,6 @@
;;
(require 'chronometrist-custom)
(require 'chronometrist-events)
(require 'chronometrist-plist-pp)
;;; Code:

View File

@ -18,12 +18,6 @@
(require 'chronometrist-migrate)
(require 'chronometrist-sexp)
(defvar chronometrist-goals-list)
(declare-function 'chronometrist-get-goal "chronometrist-goals")
(autoload 'chronometrist-maybe-start-timer "chronometrist-timer" nil t)
(autoload 'chronometrist-report "chronometrist-report" nil t)
(autoload 'chronometrist-statistics "chronometrist-statistics" nil t)
;; This is free and unencumbered software released into the public domain.
;;
;; Anyone is free to copy, modify, publish, use, compile, sell, or
@ -66,6 +60,15 @@
;; ## VARIABLES ##
;;; Code:
;; `chronometrist-goals' is an optional extension. But even these don't make the
;; warnings go away :\
(defvar chronometrist-goals-list)
(declare-function 'chronometrist-get-goal "chronometrist-goals")
(autoload 'chronometrist-maybe-start-timer "chronometrist-timer" nil t)
(autoload 'chronometrist-report "chronometrist-report" nil t)
(autoload 'chronometrist-statistics "chronometrist-statistics" nil t)
(defvar chronometrist--task-history nil)
(defvar chronometrist--point nil)
(defvar chronometrist-mode-map)
@ -83,10 +86,6 @@ button action."
"Create `chronometrist-file' if it doesn't already exist."
(chronometrist-sexp-create-file))
(defun chronometrist-current-task ()
"Return the name of the currently clocked-in task, or nil if not clocked in."
(chronometrist-sexp-current-task))
(defun chronometrist-task-active? (task)
"Return t if TASK is currently clocked in, else nil."
(equal (chronometrist-current-task) task))

View File

@ -67,16 +67,17 @@
3. Variable - chronometrist-time-re-ui
4. Variable - chronometrist-task-list
5. Internal Variable - chronometrist--fs-watch
6. Function - chronometrist-format-time (duration &optional blank)
6. Function - chronometrist-current-task ()
7. Function - chronometrist-format-time (duration &optional blank)
* vector-duration | list-duration -> "h:m:s"
7. Function - chronometrist-common-file-empty-p (file)
8. Function - chronometrist-common-clear-buffer (buffer)
9. Function - chronometrist-format-keybinds (command map &optional firstonly)
10. Function - chronometrist-events->time-list (events)
8. Function - chronometrist-common-file-empty-p (file)
9. Function - chronometrist-common-clear-buffer (buffer)
10. Function - chronometrist-format-keybinds (command map &optional firstonly)
11. Function - chronometrist-events->time-list (events)
* (event ...) -> ((encode-time encode-time) ...)
11. Function - chronometrist-time-list->sum-of-intervals (time-value-lists)
12. Function - chronometrist-time-list->sum-of-intervals (time-value-lists)
* ((encode-time encode-time) ...) -> encode-time
12. Function - chronometrist-previous-week-start (date-string)
13. Function - chronometrist-previous-week-start (date-string)
*** chronometrist-custom.el
1. Custom variable - chronometrist-file
2. Custom variable - chronometrist-buffer-name
@ -98,35 +99,34 @@
3. Keymap - chronometrist-mode-map
4. Command - chronometrist-open-log (&optional button)
5. Function - chronometrist-common-create-file ()
6. Function - chronometrist-current-task ()
7. Function - chronometrist-task-active? (task)
6. Function - chronometrist-task-active? (task)
* String -> Boolean
8. Function - chronometrist-activity-indicator ()
9. Function - chronometrist-entries ()
10. Function - chronometrist-task-at-point ()
11. Function - chronometrist-goto-last-task ()
12. Function - chronometrist-print-keybind (command &optional description firstonly)
13. Function - chronometrist-print-non-tabular ()
14. Function - chronometrist-goto-nth-task (n)
15. Function - chronometrist-refresh (&optional ignore-auto noconfirm)
16. Function - chronometrist-refresh-file (fs-event)
17. Command - chronometrist-query-stop ()
18. Command - chronometrist-in (task &optional prefix)
19. Command - chronometrist-out (&optional prefix)
20. Variable - chronometrist-before-in-functions
21. Variable - chronometrist-after-in-functions
22. Variable - chronometrist-before-out-functions
23. Variable - chronometrist-after-out-functions
24. Function - chronometrist-run-functions-and-clock-in (task)
25. Function - chronometrist-run-functions-and-clock-out (task)
26. Keymap - chronometrist-mode-map
27. Major Mode - chronometrist-mode
28. Function - chronometrist-toggle-task-button (button)
29. Function - chronometrist-add-new-task-button (button)
30. Command - chronometrist-toggle-task (&optional prefix inhibit-hooks)
31. Command - chronometrist-toggle-task-no-hooks (&optional prefix)
32. Command - chronometrist-add-new-task ()
33. Command - chronometrist (&optional arg)
7. Function - chronometrist-activity-indicator ()
8. Function - chronometrist-entries ()
9. Function - chronometrist-task-at-point ()
10. Function - chronometrist-goto-last-task ()
11. Function - chronometrist-print-keybind (command &optional description firstonly)
12. Function - chronometrist-print-non-tabular ()
13. Function - chronometrist-goto-nth-task (n)
14. Function - chronometrist-refresh (&optional ignore-auto noconfirm)
15. Function - chronometrist-refresh-file (fs-event)
16. Command - chronometrist-query-stop ()
17. Command - chronometrist-in (task &optional prefix)
18. Command - chronometrist-out (&optional prefix)
19. Variable - chronometrist-before-in-functions
20. Variable - chronometrist-after-in-functions
21. Variable - chronometrist-before-out-functions
22. Variable - chronometrist-after-out-functions
23. Function - chronometrist-run-functions-and-clock-in (task)
24. Function - chronometrist-run-functions-and-clock-out (task)
25. Keymap - chronometrist-mode-map
26. Major Mode - chronometrist-mode
27. Function - chronometrist-toggle-task-button (button)
28. Function - chronometrist-add-new-task-button (button)
29. Command - chronometrist-toggle-task (&optional prefix inhibit-hooks)
30. Command - chronometrist-toggle-task-no-hooks (&optional prefix)
31. Command - chronometrist-add-new-task ()
32. Command - chronometrist (&optional arg)
*** chronometrist-events.el
1. Variable - chronometrist-events
2. Function - chronometrist-list-midnight-spanning-events ()