From 9c6be2e953c66bbda406854797d672976877603e Mon Sep 17 00:00:00 2001
From: Case Duckworth
Date: Wed, 19 May 2021 12:38:23 -0500
Subject: Setup winum keys after frame is setup

I should probably change this to `after-make-frame-functions' instead...
---
 init.el | 32 +++++++++++++++++++-------------
 1 file changed, 19 insertions(+), 13 deletions(-)

(limited to 'init.el')

diff --git a/init.el b/init.el
index a6e29a4..31413a4 100644
--- a/init.el
+++ b/init.el
@@ -1072,21 +1072,27 @@ if ripgrep is installed, otherwise `consult-grep'."
   (global-whitespace-cleanup-mode +1))
 
 (setup (:straight winum)
-  (:option winum-auto-setup-mode-line nil
+  (:option winum-scope 'frame-local
+           winum-auto-setup-mode-line nil
            winum-ignored-buffers '(" *which-key*"))
 
-  (when (display-graphic-p)
-    (:with-map winum-keymap
-      (:bind "M-0" winum-select-window-0-or-10
-             "M-1" winum-select-window-1
-             "M-2" winum-select-window-2
-             "M-3" winum-select-window-3
-             "M-4" winum-select-window-4
-             "M-5" winum-select-window-5
-             "M-6" winum-select-window-6
-             "M-7" winum-select-window-7
-             "M-8" winum-select-window-8
-             "M-9" winum-select-window-9)))
+  (when-unfocused winum-map-keys
+    (defvar winum--keys-mapped nil
+      "Whether `winum' keys have been mapped already.")
+    (when (and (not winum--keys-mapped)
+               (display-graphic-p))
+      (:with-map winum-keymap
+        (:bind "M-0" winum-select-window-0-or-10
+               "M-1" winum-select-window-1
+               "M-2" winum-select-window-2
+               "M-3" winum-select-window-3
+               "M-4" winum-select-window-4
+               "M-5" winum-select-window-5
+               "M-6" winum-select-window-6
+               "M-7" winum-select-window-7
+               "M-8" winum-select-window-8
+               "M-9" winum-select-window-9))
+      (setq winum--keys-mapped t)))
 
   (winum-mode +1))
 
-- 
cgit 1.4.1-21-gabe81