From 59f26f63f687592650de779c7fa62a4c0f7c007c Mon Sep 17 00:00:00 2001
From: Bozhidar Batsov <bozhidar@batsov.com>
Date: Thu, 14 Jun 2012 15:12:33 +0300
Subject: [PATCH] fixed #166 - switched to guru-mode to enforce good Emacs
 navigation habits

---
 prelude/prelude-core.el               | 11 -----------
 prelude/prelude-editor.el             |  4 ++++
 prelude/prelude-global-keybindings.el | 10 ----------
 prelude/prelude-packages.el           |  2 +-
 4 files changed, 5 insertions(+), 22 deletions(-)

diff --git a/prelude/prelude-core.el b/prelude/prelude-core.el
index c76fad5..00140cb 100644
--- a/prelude/prelude-core.el
+++ b/prelude/prelude-core.el
@@ -331,17 +331,6 @@ there's a region, all lines that region covers will be duplicated."
     (unless (or (eql buffer (current-buffer)) (not (buffer-file-name buffer)))
       (kill-buffer buffer))))
 
-(defun prelude-restore-arrow-keys ()
-  "Restores arrow keys navigation in buffers."
-  (interactive)
-  (global-set-key [up]      'previous-line)
-  (global-set-key [down]    'next-line)
-  (global-set-key [left]    'backward-char)
-  (global-set-key [right]   'forward-char)
-  (global-set-key [M-right] 'right-word)
-  (global-set-key [M-left]  'left-word)
-  (message "Arrow keys navigation in buffers in now allowed."))
-
 (require 'repeat)
 
 (defun make-repeatable-command (cmd)
diff --git a/prelude/prelude-editor.el b/prelude/prelude-editor.el
index 9441cb9..fdafd7f 100644
--- a/prelude/prelude-editor.el
+++ b/prelude/prelude-editor.el
@@ -198,6 +198,10 @@
 (add-to-list 'yas/snippet-dirs prelude-snippets-dir)
 (yas/global-mode 1)
 
+;; became an Emacs guru in the keystroke department
+(require 'guru-mode)
+(guru-mode +1)
+
 ;; projectile is a project management mode
 (require 'projectile)
 (projectile-global-mode t)
diff --git a/prelude/prelude-global-keybindings.el b/prelude/prelude-global-keybindings.el
index 54c1194..949e5c9 100644
--- a/prelude/prelude-global-keybindings.el
+++ b/prelude/prelude-global-keybindings.el
@@ -85,16 +85,6 @@
 ;; toggle menu-bar visibility
 (global-set-key (kbd "<f12>") 'menu-bar-mode)
 
-;; real Emacs hackers don't use the arrow keys
-(global-unset-key [up])
-(global-unset-key [down])
-(global-unset-key [left])
-(global-unset-key [right])
-
-;; use M-f and M-b instead
-(global-unset-key [M-left])
-(global-unset-key [M-right])
-
 (global-set-key (kbd "C-x g") 'magit-status)
 
 (global-set-key (kbd "C-=") 'er/expand-region)
diff --git a/prelude/prelude-packages.el b/prelude/prelude-packages.el
index d3d48cc..37cb7cc 100644
--- a/prelude/prelude-packages.el
+++ b/prelude/prelude-packages.el
@@ -42,7 +42,7 @@
 (setq url-http-attempt-keepalives nil)
 
 (defvar prelude-packages
-  '(ack-and-a-half expand-region gist helm helm-projectile magit magithub melpa
+  '(ack-and-a-half expand-region gist guru-mode helm helm-projectile magit magithub melpa
                    rainbow-mode volatile-highlights yasnippet zenburn-theme)
   "A list of packages to ensure are installed at launch.")