From 44d58fe6f5f2f6f3e164ac4043b2a4265d4db73b Mon Sep 17 00:00:00 2001
From: Sebastian Wiesner <lunaryorn@gmail.com>
Date: Fri, 24 May 2013 15:15:51 +0200
Subject: [PATCH] Do not bind keys automatically

---
 README.asciidoc  | 9 ++++++---
 switch-window.el | 4 ++--
 2 files changed, 8 insertions(+), 5 deletions(-)

diff --git a/README.asciidoc b/README.asciidoc
index b7540d8..1c8cc75 100644
--- a/README.asciidoc
+++ b/README.asciidoc
@@ -6,9 +6,12 @@ Check out this http://tapoueh.org/emacs/switch-window.html[screenshot], then ins
 +switch-window.el+ file here (with http://github.com/dimitri/el-get[El-Get] or
 https://melpa.milkbox.net[MELPA] it's even easier).
 
-== Manual install
+== Installation
 
-Download the file or +git clone git://github.com/dimitri/el-get.git+ then do
-the following, which will steal your +C-x o+ key:
+Rebind your +C-x o+ key:
+
+  (global-set-key (kbd "C-x o") 'switch-window)
+
+If you do not use El-Get or ELPA, you need to require the package first:
 
   (require 'switch-window)
diff --git a/switch-window.el b/switch-window.el
index 1b9c332..3d4a82d 100755
--- a/switch-window.el
+++ b/switch-window.el
@@ -14,7 +14,8 @@
 ;; Install:
 ;;  (require 'switch-window)
 ;;
-;; It'll take over your C-x o binding.
+;; Rebind your C-x o key:
+;;  (global-set-key (kbd "C-x o") 'switch-window)
 ;;
 ;; Changelog
 ;;
@@ -228,6 +229,5 @@ ask user for the window to select"
 	  (set-window-dedicated-p (car w) (cdr w))))
       key))
 
-(global-set-key (kbd "C-x o") 'switch-window)
 (provide 'switch-window)
 ;;; switch-window.el ends here