From 8ef30e38c18c48da547d7c75735c20a2efcca777 Mon Sep 17 00:00:00 2001 From: Craig Jennings Date: Thu, 2 Jul 2026 01:40:07 -0400 Subject: fix(org-capture): block global popup keys while a capture is open F1, F10, F11, F12, and M-SPC are global popup keys (dashboard sweep, music, dirvish-side, terminal, agent swap) and fired over an in-progress capture. org-capture-mode's keymap is active exactly for the capture's duration and shadows the global map, so those keys now hit a blocker there that names the way out (C-c C-c to finalize, C-c C-k to abort). The C-; a prefix stays unblocked: a deliberate two-chord sequence isn't a stray keypress. --- tests/test-org-capture-config-fkey-guard.el | 42 +++++++++++++++++++++++++++++ 1 file changed, 42 insertions(+) create mode 100644 tests/test-org-capture-config-fkey-guard.el (limited to 'tests') diff --git a/tests/test-org-capture-config-fkey-guard.el b/tests/test-org-capture-config-fkey-guard.el new file mode 100644 index 00000000..b288ce4f --- /dev/null +++ b/tests/test-org-capture-config-fkey-guard.el @@ -0,0 +1,42 @@ +;;; test-org-capture-config-fkey-guard.el --- capture F-key guard -*- lexical-binding: t; -*- + +;;; Commentary: +;; While a capture is in progress, the global popup keys (F1 dashboard +;; sweep, F10 music, F11 dirvish-side, F12 terminal, M-SPC agent swap) +;; must not fire and pop UI over the capture. org-capture-mode is a +;; minor mode active exactly for the capture's duration and its keymap +;; shadows the global map, so the guard binds those keys there to a +;; blocker that signals a `user-error' naming the way out. + +;;; Code: + +(require 'ert) + +(add-to-list 'load-path (expand-file-name "modules" user-emacs-directory)) + +;; Load org-capture first so the module's with-eval-after-load fires +;; synchronously. +(require 'org-capture) +(require 'org-capture-config) + +(ert-deftest test-org-capture-fkey-guard-keys-bound () + "Normal: every leaking popup key is bound to the blocker in capture mode." + (dolist (key '("" "" "" "" "M-SPC")) + (should (eq (keymap-lookup org-capture-mode-map key) + #'cj/--org-capture-blocked-key)))) + +(ert-deftest test-org-capture-fkey-guard-blocker-signals-user-error () + "Error: the blocker signals a user-error rather than doing nothing." + (should-error (cj/--org-capture-blocked-key) :type 'user-error)) + +(ert-deftest test-org-capture-fkey-guard-shadows-global () + "Normal: with org-capture-mode active, the minor-mode binding wins." + (with-temp-buffer + (org-capture-mode 1) + (unwind-protect + (should (eq (key-binding (kbd "")) + #'cj/--org-capture-blocked-key)) + (org-capture-mode -1)))) + +(provide 'test-org-capture-config-fkey-guard) +;;; test-org-capture-config-fkey-guard.el ends here -- cgit v1.2.3