From a70e8ee603b312f28c703f858a42a945f2ca56d5 Mon Sep 17 00:00:00 2001 From: Craig Jennings Date: Sat, 16 May 2026 03:45:29 -0500 Subject: refactor(org-workflow): four hygiene fixes from the module-by-module re-review - org-roam-config.el: extract `cj/--org-roam-should-copy-completed-task-p' and gate the `org-after-todo-state-change-hook' on it. Skips fileless buffers (org-capture, indirect, temp Org) where `buffer-file-name' is nil and the downstream copy used to crash. Same gcal.org skip preserved. Five existing tests updated to bind `buffer-file-name' inside `run-hooks' so the positive-case hook still fires. - org-webclipper.el: drop the redundant `org-protocol-protocol-alist' registration inside `cj/webclipper-ensure-initialized'. The `with-eval-after-load 'org-protocol' block at the bottom of the module is the single registration site now; comment in the initializer explains why. Split the matching test into two: one for template registration (the initializer's actual job) and one for protocol registration (which now fires from the after-load block when `org-protocol' provides). - org-webclipper.el: validate `:url' and `:title' in `cj/org-protocol-webclip'. `:url' must be a non-empty string; `:title' must be a string when provided. Signals `user-error' with the unexpected value instead of silently setting the globals to nil and failing downstream in the capture handler. - mu4e-org-contacts-integration.el: declare `contacts-file' (via `eval-when-compile (defvar ...)') and `cj/get-all-contact-emails' (via `declare-function') near the top of the file. Byte-compile in isolation no longer warns about free variables / unknown functions; the cross-module dependency is explicit at the top. --- modules/org-roam-config.el | 22 +++++++++++++++++----- 1 file changed, 17 insertions(+), 5 deletions(-) (limited to 'modules/org-roam-config.el') diff --git a/modules/org-roam-config.el b/modules/org-roam-config.el index d0851ee4..306c7fe2 100644 --- a/modules/org-roam-config.el +++ b/modules/org-roam-config.el @@ -77,14 +77,26 @@ (global-set-key (kbd "C-c n d") org-roam-dailies-map) (org-roam-db-autosync-mode)) -;; Move closed tasks to today's journal when marked done +;; Move closed tasks to today's journal when marked done. + +(defun cj/--org-roam-should-copy-completed-task-p () + "Return non-nil when the current org-state change should copy to today's journal. +Skips: +- Fileless buffers (org-capture, indirect buffers, temp Org buffers) +- The gcal.org buffer (synced from Google Calendar) +- State changes that didn't actually enter a done state +- State changes where the previous state was already done (avoid re-copy)" + (let ((file (buffer-file-name))) + (and file + (bound-and-true-p org-state) + (member org-state org-done-keywords) + (not (member org-last-state org-done-keywords)) + (not (string= file (expand-file-name gcal-file)))))) + (with-eval-after-load 'org (add-to-list 'org-after-todo-state-change-hook (lambda () - (when (and (member org-state org-done-keywords) - (not (member org-last-state org-done-keywords)) - ;; Don't run for gcal.org - it's synced from Google Calendar - (not (string= (buffer-file-name) (expand-file-name gcal-file)))) + (when (cj/--org-roam-should-copy-completed-task-p) (cj/org-roam-copy-todo-to-today))))) ;; ------------------------- Org Roam Insert Immediate ------------------------- -- cgit v1.2.3