summaryrefslogtreecommitdiff
path: root/lisp/init-elisp.el
diff options
context:
space:
mode:
authorKyle Meyer <kyle@kyleam.com>2015-05-21 01:47:40 -0400
committerKyle Meyer <kyle@kyleam.com>2015-05-21 01:47:40 -0400
commite53becab23aeae58b4d156f9d45428342c15a4b1 (patch)
treefeb3271bf132d9d805403a543a7805e41fb0f947 /lisp/init-elisp.el
parent6a579dcd64ea07df6d430b9ced86c963dec20609 (diff)
downloademacs.d-e53becab23aeae58b4d156f9d45428342c15a4b1.tar.gz
Go back to Paredit
This reverts commit ad8a9a3d94c3553d59e3d4ad2b99580d8d395c21 and e158f7f14b061eb731ea44ddac1f09f1008380de.
Diffstat (limited to 'lisp/init-elisp.el')
-rw-r--r--lisp/init-elisp.el16
1 files changed, 15 insertions, 1 deletions
diff --git a/lisp/init-elisp.el b/lisp/init-elisp.el
index a6cee16..8ec711d 100644
--- a/lisp/init-elisp.el
+++ b/lisp/init-elisp.el
@@ -1,4 +1,18 @@
-(add-hook 'emacs-lisp-mode-hook 'lispy-mode)
+(autoload 'enable-paredit-mode "paredit"
+ "Turn on pseudo-structural editing of Lisp code."
+ t)
+
+(add-hook 'emacs-lisp-mode-hook 'enable-paredit-mode)
+
+(after 'paredit
+ (define-key paredit-mode-map (kbd "C-,") 'paredit-forward-slurp-sexp)
+ (define-key paredit-mode-map (kbd "C-.") 'paredit-forward-barf-sexp)
+ (define-key paredit-mode-map (kbd "C-M-,") 'paredit-backward-slurp-sexp)
+ (define-key paredit-mode-map (kbd "C-M-.") 'paredit-backward-barf-sexp)
+
+ ;; Don't let `paredit-splice-sexp' override default 'M-s' map.
+ (define-key paredit-mode-map (kbd "M-s") nil)
+ (define-key paredit-mode-map (kbd "M-p") 'paredit-splice-sexp))
(provide 'init-elisp)