From 1aa655648a501c2d6d80c4416ee13eabe0aae959 Mon Sep 17 00:00:00 2001
From: Kyle Meyer <kyle@kyleam.com>
Date: Fri, 29 May 2015 22:28:15 -0400
Subject: Revert "Go back to Paredit"

This reverts commit e53becab23aeae58b4d156f9d45428342c15a4b1.
---
 lisp/init-editing.el |  6 +++++-
 lisp/init-elisp.el   | 52 +---------------------------------------------------
 2 files changed, 6 insertions(+), 52 deletions(-)

(limited to 'lisp')

diff --git a/lisp/init-editing.el b/lisp/init-editing.el
index 10482de..1bb91de 100644
--- a/lisp/init-editing.el
+++ b/lisp/init-editing.el
@@ -12,6 +12,9 @@
                                          try-complete-lisp-symbol-partially
                                          try-complete-lisp-symbol))
 
+;; This is bound separately in `km/editing-map'.
+(setq iedit-toggle-key-default nil)
+
 (setq flyspell-auto-correct-binding (kbd "C-c e ;"))
 
 (after 'flyspell
@@ -176,8 +179,9 @@ touches."
 (define-prefix-command 'km/editing-map)
 (global-set-key (kbd "C-c e") 'km/editing-map)
 
+(define-key km/editing-map (kbd "C-i") 'indent-relative)
 (define-key km/editing-map "f" 'km/fill-surrounding-indented)
-(define-key km/editing-map "i" 'indent-relative)
+(define-key km/editing-map "i" 'iedit-mode)
 
 (electric-indent-mode -1)
 (electric-pair-mode 1)
diff --git a/lisp/init-elisp.el b/lisp/init-elisp.el
index a1cc592..a6cee16 100644
--- a/lisp/init-elisp.el
+++ b/lisp/init-elisp.el
@@ -1,54 +1,4 @@
 
-(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-,")
-    (defhydra hydra-paredit ()
-      "
-_a_: beginning of defun  _j_: forward slurp
-_f_: forward             _k_: forward barf
-_b_: backward            _u_: backward slurp
-_p_: backward down       _i_: backward barf
-_n_: forward up
-_d_: forward down        _w_: copy as kill
-_v_: backward up         _q_: indent sexp
-
-_c_: convolute sexp      _l_: split sexp
-_r_: raise               _o_: join sexp
-_s_: splice sexp
-_R_: wrap round
-"
-      ("j" paredit-forward-slurp-sexp nil)
-      ("k" paredit-forward-barf-sexp nil)
-      ("u" paredit-backward-slurp-sexp nil)
-      ("i" paredit-backward-barf-sexp nil)
-
-      ("a" beginning-of-defun nil)
-      ("f" paredit-forward nil)
-      ("b" paredit-backward nil)
-      ("p" paredit-backward-down nil)
-      ("n" paredit-forward-up nil)
-      ("d" paredit-forward-down nil)
-      ("v" paredit-backward-up nil)
-
-      ("c" paredit-convolute-sexp nil)
-      ("r" paredit-raise-sexp nil)
-      ("s" paredit-splice-sexp nil)
-      ("R" paredit-wrap-round nil)
-
-      ("l" paredit-split-sexp nil)
-      ("o" paredit-join-sexps nil)
-
-      ("w" paredit-copy-as-kill nil)
-
-      ("q" indent-pp-sexp nil)))
-
-  ;; 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))
+(add-hook 'emacs-lisp-mode-hook 'lispy-mode)
 
 (provide 'init-elisp)
-- 
cgit v1.2.3