From 4de01c9547049260435826984f316fcb1848a842 Mon Sep 17 00:00:00 2001
From: jao <jao@gnu.org>
Date: Sat, 24 Sep 2022 15:48:20 +0100
Subject: switch-window everywhere

---
 init.el | 61 ++++++++++++++++++++++++++++++-------------------------------
 1 file changed, 30 insertions(+), 31 deletions(-)

(limited to 'init.el')

diff --git a/init.el b/init.el
index 70a7224..76993c7 100644
--- a/init.el
+++ b/init.el
@@ -1035,37 +1035,36 @@
 (define-key ctl-x-4-map (kbd "t") 'transpose-windows)
 
 ;;;; switch window
-(when (or window-system jao-wayland-enabled)
-  (use-package switch-window
-    :ensure t
-    :custom ((switch-window-minibuffer-shortcut ?z)
-             (switch-window-background t)
-             (switch-window-shortcut-style 'qwerty)
-             (switch-window-shortcut-appearance 'text)
-             (switch-window-timeout 7)
-             (switch-window-threshold 2))
-    :config
-    (defun jao-switch-window--then (prompt cmd)
-      (let ((f `(lambda ()
-                  (let ((default-directory ,default-directory))
-                    (call-interactively ',cmd)))))
-        (switch-window--then prompt f f)))
-
-    (defun jao-switch-window-then-dired ()
-      (interactive)
-      (jao-switch-window--then "Find directory" 'dired))
-
-    (defun jao-switch-window-then-find-file ()
-      (interactive)
-      (jao-switch-window--then "Find file" 'find-file))
-
-    (defun jao-switch-window-then-consult-buffer ()
-      (interactive)
-      (jao-switch-window--then "Switch to buffer" 'consult-buffer))
-
-    :bind (("C-x 4 d" . jao-switch-window-then-dired)
-           ("C-x 4 f" . jao-switch-window-then-find-file)
-           ("C-x 4 b" . jao-switch-window-then-consult-buffer))))
+(use-package switch-window
+  :ensure t
+  :custom ((switch-window-minibuffer-shortcut ?z)
+           (switch-window-background t)
+           (switch-window-shortcut-style 'qwerty)
+           (switch-window-shortcut-appearance 'text)
+           (switch-window-timeout 7)
+           (switch-window-threshold 2))
+  :config
+  (defun jao-switch-window--then (prompt cmd)
+    (let ((f `(lambda ()
+                (let ((default-directory ,default-directory))
+                  (call-interactively ',cmd)))))
+      (switch-window--then prompt f f)))
+
+  (defun jao-switch-window-then-dired ()
+    (interactive)
+    (jao-switch-window--then "Find directory" 'dired))
+
+  (defun jao-switch-window-then-find-file ()
+    (interactive)
+    (jao-switch-window--then "Find file" 'find-file))
+
+  (defun jao-switch-window-then-consult-buffer ()
+    (interactive)
+    (jao-switch-window--then "Switch to buffer" 'consult-buffer))
+
+  :bind (("C-x 4 d" . jao-switch-window-then-dired)
+         ("C-x 4 f" . jao-switch-window-then-find-file)
+         ("C-x 4 b" . jao-switch-window-then-consult-buffer)))
 
 ;;;; winner mode
 (winner-mode 1)
-- 
cgit v1.2.3