From 7cc7cb3eae1df759cb222e64b4131479a4629ed7 Mon Sep 17 00:00:00 2001
From: Tom Willemse
Date: Sat, 9 May 2015 19:14:56 +0200
Subject: Use company-mode

---
 emacs/.emacs.d/init.el | 17 +++++++++--------
 1 file changed, 9 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 76e5182..ec391b3 100644
--- a/emacs/.emacs.d/init.el
+++ b/emacs/.emacs.d/init.el
@@ -948,8 +948,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 ""))
@@ -1269,9 +1269,9 @@ from myaethon2.core.decorators import (
   (setq initial-major-mode 'emacs-lisp-mode)
   (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)
@@ -1497,8 +1497,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)
@@ -1511,7 +1511,8 @@ from myaethon2.core.decorators import (
   (kill-local-variable 'mode-line-format)
   (when (string-equal (system-name) "drd")
     (require 'colemak-evil))
-  (global-evil-surround-mode))
+  (global-evil-surround-mode)
+  (global-company-mode))
 
 (with-eval-after-load 'ruby
   (global-rinari-mode))
-- 
cgit v1.2.3-54-g00ecf