aboutsummaryrefslogtreecommitdiff
path: root/modules
diff options
context:
space:
mode:
authorCraig Jennings <c@cjennings.net>2026-09-22 14:29:33 -0400
committerCraig Jennings <c@cjennings.net>2026-09-22 14:29:33 -0400
commit7c9f92eb0a6751d04a43ffe3cc5f725fce5ab371 (patch)
tree66b997100cfd7067328283e5c7568b1f650cf2a8 /modules
parentbefb206ae7b2daeb61acd20f11aa9d2d5017733f (diff)
downloaddotemacs-7c9f92eb0a6751d04a43ffe3cc5f725fce5ab371.tar.gz
dotemacs-7c9f92eb0a6751d04a43ffe3cc5f725fce5ab371.zip
fix(dirvish): move the sidebar to F9 so F11 toggles fullscreen againHEADmain
Stock Emacs binds F11 to toggle-frame-fullscreen, the key every other application uses for it. This config never rebound it, but dirvish-config's :bind put dirvish-side on F11 and shadowed the stock binding. I moved the sidebar toggle to F9, the free bare F-key: ai-term left it for M-SPC in June and the recording chord came off it today. F2 is the preview key and F5 is reserved for the debug backend, so neither was a candidate. The org-capture F-key guard follows the command rather than the key. F9 joins its list and F11 leaves it, since a fullscreen toggle pops nothing over a capture. The tests pin the new key, the un-shadowed F11, and the guard change.
Diffstat (limited to 'modules')
-rw-r--r--modules/dirvish-config.el10
-rw-r--r--modules/org-capture-config.el8
2 files changed, 14 insertions, 4 deletions
diff --git a/modules/dirvish-config.el b/modules/dirvish-config.el
index 6c849198..e9b9fde6 100644
--- a/modules/dirvish-config.el
+++ b/modules/dirvish-config.el
@@ -29,7 +29,7 @@
;; - S: Study — start an org-drill session on the .org file at point
;; - M-D (Meta-Shift-d): DWIM shell commands menu
;; - TAB: Toggle subtree expansion
-;; - F11: Toggle sidebar view
+;; - F9: Toggle sidebar view
;;; Code:
@@ -653,7 +653,13 @@ no popup frame is live."
(("C-x d" . dirvish)
("C-x C-d" . dirvish)
("C-x D" . dirvish)
- ("<f11>" . dirvish-side)
+ ;; F9, not F11: F11 is stock Emacs's toggle-frame-fullscreen, the same key
+ ;; every other application uses, and the sidebar sat on it for years by
+ ;; shadowing that. F9 is the free bare F-key: ai-term left it for M-SPC
+ ;; in June 2026 and the recording chord came off it on 2026-09-22. F2 is
+ ;; the preview key (markdown-mode binds it) and F5 is reserved for the
+ ;; debug backend, so neither was a candidate.
+ ("<f9>" . dirvish-side)
:map dirvish-mode-map
("bg" . cj/set-wallpaper)
("/" . dirvish-narrow)
diff --git a/modules/org-capture-config.el b/modules/org-capture-config.el
index b7250f1e..8f5903fe 100644
--- a/modules/org-capture-config.el
+++ b/modules/org-capture-config.el
@@ -145,12 +145,16 @@ re-scanning large target files after the first successful lookup."
:around #'cj/org-capture--set-target-location-advice))
;; --------------------------- Capture F-Key Guard -----------------------------
-;; The global popup keys (F1 dashboard sweep, F10 music, F11 dirvish-side,
+;; The global popup keys (F1 dashboard sweep, F9 dirvish-side, F10 music,
;; F12 terminal, M-SPC agent swap) fire even while a capture is in progress
;; and pop their UI over the capture popup. org-capture-mode is a minor
;; mode active exactly for the capture's duration and its keymap shadows
;; the global map, so blocking the keys there scopes the guard precisely:
;; the moment the capture finalizes or aborts, the keys work again.
+;;
+;; The list follows the command, not the key. F11 was on it while it held
+;; dirvish-side; now that F11 is the frame fullscreen toggle it pops nothing
+;; over a capture and stays usable.
(defun cj/--org-capture-blocked-key ()
"Refuse a global popup key while a capture is in progress."
@@ -160,7 +164,7 @@ re-scanning large target files after the first successful lookup."
(defvar org-capture-mode-map)
(with-eval-after-load 'org-capture
- (dolist (key '("<f1>" "<f10>" "<f11>" "<f12>" "M-SPC"))
+ (dolist (key '("<f1>" "<f9>" "<f10>" "<f12>" "M-SPC"))
(keymap-set org-capture-mode-map key #'cj/--org-capture-blocked-key)))
;; ----------------------- Project-Aware Capture Target ------------------------