From 01b36917f12c2138d4e6d3683ba4560f78dfa9c9 Mon Sep 17 00:00:00 2001
From: Bozhidar Batsov <bozhidar@tradeo.com>
Date: Sat, 13 Sep 2014 17:35:59 +0300
Subject: [PATCH] [Fix #664] Remove controversial other-window remapping

This also closes #656.
---
 core/prelude-global-keybindings.el | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/core/prelude-global-keybindings.el b/core/prelude-global-keybindings.el
index a8e241f..1a9c687 100644
--- a/core/prelude-global-keybindings.el
+++ b/core/prelude-global-keybindings.el
@@ -114,8 +114,7 @@
 (global-set-key (kbd "s-.") 'ace-jump-mode)
 (global-set-key (kbd "C-c J") 'ace-jump-buffer)
 (global-set-key (kbd "s->") 'ace-jump-buffer)
-
-(global-set-key [remap other-window] 'ace-window)
+(global-set-key (kbd "s-w") 'ace-window)
 
 (provide 'prelude-global-keybindings)