From 443bada7b11ec212d01a644df3a9a5da28632541 Mon Sep 17 00:00:00 2001
From: Tom Willemse
Date: Thu, 3 Sep 2015 15:55:17 +0200
Subject: Stop using company, bring back autocomplete

---
 emacs/.emacs.d/init.el | 15 +++++++--------
 1 file changed, 7 insertions(+), 8 deletions(-)

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

diff --git a/emacs/.emacs.d/init.el b/emacs/.emacs.d/init.el
index adc7254..4f14092 100644
--- a/emacs/.emacs.d/init.el
+++ b/emacs/.emacs.d/init.el
@@ -925,8 +925,8 @@ from myaethon2.core.decorators import (
 (auto-init appt)
 (auto-init avandu)
 
-;; (stante-after auto-complete
-;;   (add-to-list 'ac-modes 'slime-repl-mode))
+(stante-after auto-complete
+  (add-to-list 'ac-modes 'slime-repl-mode))
 
 (stante-after "bindings"
   (setq mode-line-default-help-echo ""))
@@ -1197,9 +1197,9 @@ from myaethon2.core.decorators import (
   (setq inhibit-startup-message t)
   (setq initial-scratch-message nil))
 
-;; (stante-after tern
-;;   (require 'tern-auto-complete)
-;;   (tern-ac-setup))
+(stante-after tern
+  (require 'tern-auto-complete)
+  (tern-ac-setup))
 
 (stante-after time-stamp
   (setq time-stamp-active t)
@@ -1434,8 +1434,8 @@ from myaethon2.core.decorators import (
 (oni:exclude-modes magit-blame-mode fci-mode)
 
 (oni:eval-after-init
-  ;; (require 'auto-complete-config)
-  ;; (ac-config-default)
+  (require 'auto-complete-config)
+  (ac-config-default)
 
   (ido-ubiquitous-mode)
   (smex-initialize)
@@ -1444,7 +1444,6 @@ from myaethon2.core.decorators import (
   (yas-global-mode)
   (projectile-global-mode)
 
-  (global-company-mode)
   (global-wakatime-mode))
 
 (with-eval-after-load 'ruby
-- 
cgit v1.2.3-54-g00ecf