From 8d652a9c5abe953e2993a02f4837a3cd12ac1181 Mon Sep 17 00:00:00 2001
From: Wojciech Kozlowski <wk@wojciechkozlowski.eu>
Date: Sun, 15 Dec 2019 16:04:24 +0100
Subject: [PATCH] Add ace-window package

---
 modules/emacs.el | 12 ++++++++----
 1 file changed, 8 insertions(+), 4 deletions(-)

diff --git a/modules/emacs.el b/modules/emacs.el
index cb9c92c..4292e8c 100644
--- a/modules/emacs.el
+++ b/modules/emacs.el
@@ -20,6 +20,7 @@
 (defvar emodule/emacs-packages
 
   '(ace-jump-mode
+    ace-window
     deadgrep
     dired-subtree
     discover
@@ -171,10 +172,6 @@
                     (interactive)
                     (let (kill-buffer-query-functions) (kill-buffer))))
 
-  ;; Change active window.  More convenient than "C-x o".
-  (global-set-key (kbd "M-o") 'other-window)
-  (global-set-key (kbd "M-O") (lambda () (interactive) (other-window -1)))
-
   ;; Scroll up/down, but keep point in place.
   (global-set-key (kbd "C-<") (lambda()
                                 (interactive)
@@ -330,6 +327,13 @@
   (use-package ace-jump-mode
     :bind (("C-c SPC" . ace-jump-mode)))
 
+  ;; --------------------------------------------------------------------------
+  ;; `ace-window'
+  ;; --------------------------------------------------------------------------
+
+  (use-package ace-window
+    :bind (("M-o" . ace-window)))
+
   ;; --------------------------------------------------------------------------
   ;; `deadgrep'
   ;; --------------------------------------------------------------------------