From fab6fb1270d37ea325015f1bdf6c9887f7ceacc7 Mon Sep 17 00:00:00 2001
From: Henrik Lissner <henrik@lissner.net>
Date: Fri, 5 Jan 2018 13:16:42 -0500
Subject: [PATCH] ui/window-select: use use-package :when/:unless instead of
 cond

Appease the byte-compiler.
---
 modules/ui/window-select/config.el | 42 +++++++++++++++---------------
 1 file changed, 21 insertions(+), 21 deletions(-)

diff --git a/modules/ui/window-select/config.el b/modules/ui/window-select/config.el
index eff60aa08..b055bb779 100644
--- a/modules/ui/window-select/config.el
+++ b/modules/ui/window-select/config.el
@@ -1,24 +1,24 @@
 ;;; ui/window-select/config.el -*- lexical-binding: t; -*-
 
-(cond
- ((featurep! +switch-window)
-  (def-package! switch-window
-    :commands (switch-window switch-window-then-maximize switch-window-then-split-below
-                             switch-window-then-split-right switch-window-then-delete
-                             switch-window-then-swap-buffer)
-    :init
-    (define-key global-map [remap other-window] #'switch-window)
-    :config
-    (setq switch-window-shortcut-style 'qwerty
-          switch-window-qwerty-shortcuts '("a" "s" "d" "f" "g" "h" "j" "k" "l"))))
+(def-package! switch-window
+  :when (featurep! +switch-window)
+  :commands (switch-window switch-window-then-maximize switch-window-then-split-below
+                           switch-window-then-split-right switch-window-then-delete
+                           switch-window-then-swap-buffer)
+  :init
+  (define-key global-map [remap other-window] #'switch-window)
+  :config
+  (setq switch-window-shortcut-style 'qwerty
+        switch-window-qwerty-shortcuts '("a" "s" "d" "f" "g" "h" "j" "k" "l")))
 
- ((or (featurep! +ace-window) t) ; default to ace-window
-  (def-package! ace-window
-    :commands (ace-window ace-swap-window ace-delete-window
-                          ace-select-window ace-delete-other-windows)
-    :init
-    (define-key global-map [remap other-window] #'ace-window)
-    :config
-    (setq aw-keys '(?a ?s ?d ?f ?g ?h ?j ?k ?l)
-          aw-scope 'frame
-          aw-background t))))
+
+(def-package! ace-window
+  :unless (featurep! +switch-window)
+  :commands (ace-window ace-swap-window ace-delete-window
+                        ace-select-window ace-delete-other-windows)
+  :init
+  (define-key global-map [remap other-window] #'ace-window)
+  :config
+  (setq aw-keys '(?a ?s ?d ?f ?g ?h ?j ?k ?l)
+        aw-scope 'frame
+        aw-background t))