From 365a47a1c21553df0c68b73e531e27b9d0d6a76b Mon Sep 17 00:00:00 2001
From: Henrik Lissner <henrik@lissner.net>
Date: Sat, 20 Jun 2015 10:23:34 +0200
Subject: [PATCH] Fix keybindings

---
 private/my-bindings.el | 19 ++++++++-----------
 1 file changed, 8 insertions(+), 11 deletions(-)

diff --git a/private/my-bindings.el b/private/my-bindings.el
index b2e47b3b1..5d61838ac 100644
--- a/private/my-bindings.el
+++ b/private/my-bindings.el
@@ -14,9 +14,9 @@
 
  "M-x"   'smex
  "M-X"   'smex-major-mode-commands
- "M-A-x" 'helm-M-x
+ "M-:"   'helm-M-x
  "M-;"   'eval-expression
- "C-`"   'popwin:toggle-popup-window
+ "C-`"   'narf/popwin-toggle
  "M-="   'text-scale-increase
  "M--"   'text-scale-increase
  "M-w"   'evil-window-delete
@@ -74,13 +74,7 @@
    :v "="   'align-regexp
 
    :n "qq"  'evil-save-and-quit
-   :n "QQ"  (λ (let ((confirm-kill-emacs nil))
-                 (narf:kill-all-buffers t)
-                 (save-buffers-kill-terminal)))
-
-   ;; insert lines in-place)
-   :n "jj"  (λ (save-excursion (evil-insert-newline-below)))
-   :n "kk"  (λ (save-excursion (evil-insert-newline-above)))
+   :n "QQ"  'narf/kill-all-buffers-do-not-remember
 
    :n "oo"  'narf-open-with
    :n "ob"  (λ (narf-open-with "Google Chrome"))
@@ -311,8 +305,11 @@
        :i "A-e"      'evil-forward-word-end
 
        ;; Textmate-esque insert-line before/after
-       :ni "<M-return>"    'evil-open-below
-       :ni "<S-M-return>"  'evil-open-above
+       :i "<M-return>"    'evil-open-below
+       :i "<S-M-return>"  'evil-open-above
+       ;; insert lines in-place)
+       :n "<M-return>"    (λ (save-excursion (evil-insert-newline-below)))
+       :n "<S-M-return>"  (λ (save-excursion (evil-insert-newline-above)))
 
        ;; Make ESC quit all the things
        :e [escape] 'narf-minibuffer-quit