From 011f317d2faf190cfdd4074e1ada771acab4c975 Mon Sep 17 00:00:00 2001
From: Alan Pearce
Date: Sat, 18 May 2013 11:55:06 +0100
Subject: Emacs: Remove electrify-return-if-match and replace with paredit
 keybindings in lisp-modes

---
 emacs/init.el | 7 +------
 1 file changed, 1 insertion(+), 6 deletions(-)

(limited to 'emacs/init.el')

diff --git a/emacs/init.el b/emacs/init.el
index b0fefcf..af79db7 100644
--- a/emacs/init.el
+++ b/emacs/init.el
@@ -786,9 +786,6 @@ Also returns nil if pid is nil."
           (setq autopair-blink nil
                 autopair-skip-whitespace nil)))
 
-(use-package electric-return
-  :bind (("RET" . electrify-return-if-match)))
-
 (use-package expand-region
   :bind ("C-M-SPC" . er/expand-region))
 
@@ -855,9 +852,7 @@ Also returns nil if pid is nil."
 
   (show-paren-mode t)
   (setq indent-tabs-mode nil)
-
-  (local-set-key (kbd "RET") 'electrify-return-if-match)
-  (local-set-key (kbd "C-j") 'electrify-return-if-match))
+  (local-set-key (kbd "RET") #'paredit-newline))
 
 (add-hook 'emacs-lisp-mode-hook #'ap/lisp-setup)
 (add-hook 'emacs-lisp-mode-hook #'turn-on-eldoc-mode)
-- 
cgit 1.4.1