From b28d3ff3f2cb4d38580693e93a86a0205b7927f1 Mon Sep 17 00:00:00 2001
From: Tom Willemse
Date: Tue, 21 Apr 2015 21:40:14 +0200
Subject: Add section about electric pairing

---
 emacs/.emacs.d/init.el | 10 ++++------
 1 file changed, 4 insertions(+), 6 deletions(-)

(limited to 'emacs/.emacs.d/init.el')

diff --git a/emacs/.emacs.d/init.el b/emacs/.emacs.d/init.el
index c3c7d9e..e804dec 100644
--- a/emacs/.emacs.d/init.el
+++ b/emacs/.emacs.d/init.el
@@ -1295,7 +1295,6 @@ from myaethon2.core.decorators import (
 (add-hook 'gnus-exit-group-hook 'awesome-update-current-mailbox)
 (add-hook 'gnus-exit-gnus-hook 'awesome-update-current-mailbox)
 (add-hook 'haskell-mode-hook 'oni:haskell-mode-func)
-(add-hook 'java-mode-hook #'electric-pair-local-mode)
 (add-hook 'outline-minor-mode-hook #'oni:set-tab-maybe-toggle-outline)
 (add-hook 'scheme-mode-hook (lambda () (setq ac-sources '(ac-source-geiser))))
 (add-hook 'slime-mode-hook #'set-up-slime-ac)
@@ -1322,8 +1321,7 @@ from myaethon2.core.decorators import (
   'clojure-mode-hook 'geiser-repl-mode-hook 'sawfish-mode-hook
   'scheme-mode-hook)
 
-(oni:add-hooks 'c-mode-hook
-  #'oni:c-mode-func #'electric-pair-local-mode)
+(oni:add-hooks 'c-mode-hook #'oni:c-mode-func)
 
 (oni:add-hooks 'emacs-lisp-mode-hook
   (lambda ()
@@ -1364,14 +1362,14 @@ from myaethon2.core.decorators import (
   #'oni:reset-default-directory)
 
 (oni:add-hooks 'js2-mode-hook
-  #'tern-mode #'moz-minor-mode #'electric-pair-local-mode)
+  #'tern-mode #'moz-minor-mode)
 
 (oni:add-hooks 'lisp-mode-hook
   (lambda () (setf ac-sources '(ac-source-slime-simple)))
   #'oni:set-emacs-lisp-symbols #'paredit-mode #'hl-sexp-mode)
 
 (oni:add-hooks 'lua-mode-hook
-  #'oni:lua-mode-func #'flycheck-mode #'electric-pair-local-mode)
+  #'oni:lua-mode-func #'flycheck-mode)
 
 (oni:add-hooks 'markdown-mode-hook
   #'whitespace-mode #'oni:markdown-mode-func)
@@ -1387,7 +1385,7 @@ from myaethon2.core.decorators import (
   (lambda () (setq ac-sources '(ac-source-jedi-direct)))
   #'oni:set-python-symbols #'flycheck-mode #'whitespace-mode
   #'oni:python-mode-func #'oni:set-python-imenu-function
-  #'jedi:setup #'subword-mode #'electric-pair-local-mode)
+  #'jedi:setup #'subword-mode)
 
 (oni:add-hooks 'slime-repl-mode-hook
   #'paredit-mode #'set-up-slime-ac #'hl-sexp-mode)
-- 
cgit v1.2.3-54-g00ecf