diff options
| author |  Tom Willemse | 2015-09-03 15:55:17 +0200 |
|---|---|---|
| committer | Tom Willemse | 2015-09-03 15:55:17 +0200 |
| commit | 443bada7b11ec212d01a644df3a9a5da28632541 (patch) | |
| tree | 70a2da66664998dabaad934fa568136fbcc1146d /emacs | |
| parent | 11601a8c9e51f03aac6a5e9b4e13e796977c5e7f (diff) | |
| download | dotfiles-443bada7b11ec212d01a644df3a9a5da28632541.tar.gz dotfiles-443bada7b11ec212d01a644df3a9a5da28632541.zip | |
Stop using company, bring back autocomplete
Diffstat (limited to 'emacs')
| -rw-r--r-- | emacs/.emacs.d/Cask | 1 | ||||
| -rw-r--r-- | emacs/.emacs.d/init.el | 15 |
2 files changed, 7 insertions, 9 deletions
diff --git a/emacs/.emacs.d/Cask b/emacs/.emacs.d/Cask index 89ab45f..96ea54b 100644 --- a/emacs/.emacs.d/Cask +++ b/emacs/.emacs.d/Cask @@ -17,7 +17,6 @@ (depends-on "clojure-mode") (depends-on "closure-template-html-mode") (depends-on "coffee-mode") -(depends-on "company") (depends-on "csharp-mode") (depends-on "css-eldoc") (depends-on "d-mode") 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 |