From ca79a49c35d6823b156b5eee0b7afa7281eae7c8 Mon Sep 17 00:00:00 2001
From: Henrik Lissner <henrik@lissner.net>
Date: Sun, 6 Dec 2015 22:59:15 -0500
Subject: [PATCH] Fix ex registers + register access in minibuffer

---
 private/my-bindings.el | 10 +++-------
 1 file changed, 3 insertions(+), 7 deletions(-)

diff --git a/private/my-bindings.el b/private/my-bindings.el
index a8d4399fa..10c1b5df0 100644
--- a/private/my-bindings.el
+++ b/private/my-bindings.el
@@ -310,12 +310,7 @@
  (:map view-mode-map
    "<escape>" 'View-quit-all)
 
- (:map evil-ex-completion-map
-   "C-r"            'evil-ex-paste-from-register   ; registers in ex-mode
-   "C-a"            'move-beginning-of-line
-   "<s-left>"       'move-beginning-of-line
-   "<s-right>"      'move-beginning-of-line
-   "<s-backspace>"  'evil-delete-whole-line))
+ (:map evil-ex-completion-map "C-a" 'move-beginning-of-line))
 
 ;; Line-wise mouse selection on margin
 (global-set-key (kbd "<left-margin> <down-mouse-1>") 'narf/mouse-drag-line)
@@ -384,7 +379,8 @@
              minibuffer-local-completion-map
              minibuffer-local-must-match-map
              minibuffer-local-isearch-map)
-        [escape] 'narf-minibuffer-quit)
+        [escape] 'narf-minibuffer-quit
+        "C-r" 'evil-paste-from-register)
 
       :map read-expression-map "C-w" 'backward-kill-word)