From c3db907204d3633793d4243c0066cdb6cb0749dd Mon Sep 17 00:00:00 2001 From: Aria Edmonds Date: Sat, 9 Jun 2018 22:58:45 +1000 Subject: [PATCH 1/2] Fix wakatime breaking emacs if no api-key set --- modules/tools/wakatime/autoload.el | 3 +++ 1 file changed, 3 insertions(+) diff --git a/modules/tools/wakatime/autoload.el b/modules/tools/wakatime/autoload.el index 915abcce9..ad6f435c8 100644 --- a/modules/tools/wakatime/autoload.el +++ b/modules/tools/wakatime/autoload.el @@ -3,6 +3,9 @@ ;;;###autoload (add-hook 'doom-after-switch-buffer-hook #'+wakatime-init) +;;;###autoload +(defvar wakatime-api-key nil) + ;;;###autoload (defun +wakatime-init () "Initialize wakatime (if `wakatime-api-key' is set, otherwise no-op with a From e88de1692d9c6ec26d820c4a38dfe9be9e3fb5ef Mon Sep 17 00:00:00 2001 From: Aria Edmonds Date: Sat, 9 Jun 2018 23:43:39 +1000 Subject: [PATCH 2/2] Don't shadow wakatime-api-key --- modules/tools/wakatime/autoload.el | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/modules/tools/wakatime/autoload.el b/modules/tools/wakatime/autoload.el index ad6f435c8..1589ca5bb 100644 --- a/modules/tools/wakatime/autoload.el +++ b/modules/tools/wakatime/autoload.el @@ -3,14 +3,11 @@ ;;;###autoload (add-hook 'doom-after-switch-buffer-hook #'+wakatime-init) -;;;###autoload -(defvar wakatime-api-key nil) - ;;;###autoload (defun +wakatime-init () "Initialize wakatime (if `wakatime-api-key' is set, otherwise no-op with a warning)." - (if wakatime-api-key + (if (boundp 'wakatime-api-key) (global-wakatime-mode +1) (message "No `wakatime-api-key' set! wakaktime-mode will stay disabled.")) (remove-hook 'doom-after-switch-buffer-hook #'+wakatime-init))