From 70c21eedc550eb92e7f685b6f9ed723451443e99 Mon Sep 17 00:00:00 2001
From: James Bunton <jamesbunton@delx.net.au>
Date: Sun, 31 Jul 2016 09:37:20 +1000
Subject: [PATCH] ace-window

---
 .gitmodules            | 3 +++
 lisp/my-keys.el        | 1 +
 lisp/my-minor-modes.el | 5 +++++
 packages/ace-window    | 1 +
 4 files changed, 10 insertions(+)
 create mode 160000 packages/ace-window

diff --git a/.gitmodules b/.gitmodules
index b1d3e6e..2347b60 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -109,3 +109,6 @@
 [submodule "elisp-slime-nav"]
 	path = packages/elisp-slime-nav
 	url = https://github.com/purcell/elisp-slime-nav.git
+[submodule "ace-window"]
+	path = packages/ace-window
+	url = https://github.com/abo-abo/ace-window.git
diff --git a/lisp/my-keys.el b/lisp/my-keys.el
index 7bb45ce..398c223 100644
--- a/lisp/my-keys.el
+++ b/lisp/my-keys.el
@@ -25,6 +25,7 @@
 (global-set-key (kbd "C-c g r") 'git-gutter:revert-hunk)
 
 ;; Windows/frames
+(global-set-key (kbd "C-x o") 'ace-window)
 (global-set-key (kbd "<C-up>") 'windmove-up)
 (global-set-key (kbd "<C-down>") 'windmove-down)
 (global-set-key (kbd "<C-left>") 'windmove-left)
diff --git a/lisp/my-minor-modes.el b/lisp/my-minor-modes.el
index 711e721..f1141af 100644
--- a/lisp/my-minor-modes.el
+++ b/lisp/my-minor-modes.el
@@ -1,5 +1,9 @@
 ;;; -*- lexical-binding: t -*-
 
+(require 'ace-window)
+(setq aw-scope 'frame)
+(setq aw-keys '(?h ?t ?n ?s))
+
 (require 'autorevert)
 (global-auto-revert-mode 1)
 (setq global-auto-revert-non-file-buffers t)
@@ -9,6 +13,7 @@
 (setq avy-background t)
 (setq avy-all-windows nil)
 (setq avy-timeout-seconds 0.3)
+(setq avy-keys '(?a ?o ?e ?u ?h ?t ?n ?s))
 
 (require 'change-inner)
 
diff --git a/packages/ace-window b/packages/ace-window
new file mode 160000
index 0000000..77cc05f
--- /dev/null
+++ b/packages/ace-window
@@ -0,0 +1 @@
+Subproject commit 77cc05f7284577ed396f292de0e7bb8ec561ea81
-- 
2.39.2