From e6caf7a1cf632ff865f01075d2b939a305a04e47 Mon Sep 17 00:00:00 2001
From: Tom Willemse
Date: Mon, 24 Feb 2014 08:36:09 +0100
Subject: Remove smartparens

---
 .emacs.d/Cask    |  1 -
 .emacs.d/init.el | 28 +++++-----------------------
 2 files changed, 5 insertions(+), 24 deletions(-)

(limited to '.emacs.d')

diff --git a/.emacs.d/Cask b/.emacs.d/Cask
index f159aee..f55ce9c 100644
--- a/.emacs.d/Cask
+++ b/.emacs.d/Cask
@@ -52,7 +52,6 @@
 (depends-on "rainbow-delimiters")
 (depends-on "rainbow-mode")
 (depends-on "slime-js")
-(depends-on "smartparens")
 (depends-on "smex")
 (depends-on "svg-mode-line-themes")
 (depends-on "tagedit")
diff --git a/.emacs.d/init.el b/.emacs.d/init.el
index cbce9d8..b3e42a7 100644
--- a/.emacs.d/init.el
+++ b/.emacs.d/init.el
@@ -679,17 +679,6 @@ For `python-mode' I prefer `python-imenu-create-flat-index'."
             (">=" . ?≥)
             ("!=" . ?≠)))))
 
-(defun oni:set-smartparens-keys ()
-  "Set some keys for `smartparens-mode'."
-  (local-set-key [remap backward-delete-char] 'sp-backward-delete-char)
-  (local-set-key [remap delete-char] 'sp-delete-char)
-  (local-set-key [remap kill-word] 'sp-kill-word)
-  (local-set-key [remap backward-kill-word] 'sp-backward-kill-word)
-  (local-set-key (kbd "<C-left>") 'sp-forward-barf-sexp)
-  (local-set-key (kbd "<C-right>") 'sp-forward-slurp-sexp)
-  (local-set-key (kbd "M-J") 'sp-join-sexp)
-  (local-set-key (kbd "M-S") 'sp-split-sexp))
-
 (defun oni:set-tab-maybe-toggle-outline ()
   "Wrap the current function mapped to `TAB'."
   (let ((func (or (lookup-key (current-local-map) (kbd "TAB"))
@@ -1179,10 +1168,6 @@ If no direction is given, don't split."
           (clisp ("clisp") :coding-system utf-8-unix))
         slime-default-lisp 'sbcl))
 
-(stante-after smartparens
-  (setq sp-cancel-autoskip-on-backward-movement nil
-        sp-autoskip-closing-pair 'always))
-
 (stante-after smex
   (setq smex-key-advice-ignore-menu-bar t)
   (setq smex-save-file "~/.emacs.d/smex-items"))
@@ -1244,7 +1229,6 @@ If no direction is given, don't split."
 (add-hook 'org-mode-hook #'yas-minor-mode)
 (add-hook 'outline-minor-mode-hook #'oni:set-tab-maybe-toggle-outline)
 (add-hook 'slime-mode-hook #'set-up-slime-ac)
-(add-hook 'smartparens-mode-hook #'oni:set-smartparens-keys)
 (add-hook 'sql-interactive-mode-hook #'oni:augment-sql-prompt)
 (add-hook 'term-mode-hook 'oni:term-mode-func)
 (add-hook 'vala-mode-hook #'oni:vala-mode-func)
@@ -1263,8 +1247,7 @@ If no direction is given, don't split."
   'clojure-mode-hook 'geiser-repl-mode-hook 'sawfish-mode-hook
   'scheme-mode-hook)
 
-(oni:add-hooks 'c-mode-hook
-  #'smartparens-strict-mode #'oni:c-mode-func)
+(oni:add-hooks 'c-mode-hook #'oni:c-mode-func)
 
 (oni:add-hooks 'css-mode-hook
   #'oni:css-mode-func #'rainbow-mode)
@@ -1298,8 +1281,7 @@ If no direction is given, don't split."
   #'moz-minor-mode #'oni:js-mode-func)
 
 (oni:add-hooks 'js2-mode-hook
-  #'tern-mode #'oni:js2-mode-func #'smartparens-strict-mode
-  #'moz-minor-mode)
+  #'tern-mode #'oni:js2-mode-func #'moz-minor-mode)
 
 (oni:add-hooks 'lisp-mode-hook
   #'oni:set-emacs-lisp-symbols #'paredit-mode)
@@ -1318,9 +1300,9 @@ If no direction is given, don't split."
   #'rainbow-delimiters-mode #'oni:maybe-prettify-symbols-mode)
 
 (oni:add-hooks 'python-mode-hook
-  #'oni:set-python-symbols #'flycheck-mode #'smartparens-strict-mode
-  #'whitespace-mode #'oni:python-mode-func
-  #'oni:set-python-imenu-function #'jedi:setup #'subword-mode)
+  #'oni:set-python-symbols #'flycheck-mode #'whitespace-mode
+  #'oni:python-mode-func #'oni:set-python-imenu-function
+  #'jedi:setup #'subword-mode)
 
 (oni:add-hooks 'slime-repl-mode-hook
   #'paredit-mode #'set-up-slime-ac)
-- 
cgit v1.2.3-54-g00ecf