summary refs log tree commit diff stats
diff options
context:
space:
mode:
-rw-r--r--emacs/elisp/el-get-setup.el1
-rw-r--r--emacs/init.el6
2 files changed, 7 insertions, 0 deletions
diff --git a/emacs/elisp/el-get-setup.el b/emacs/elisp/el-get-setup.el
index 2d93e44..bd880db 100644
--- a/emacs/elisp/el-get-setup.el
+++ b/emacs/elisp/el-get-setup.el
@@ -22,6 +22,7 @@
    auto-indent-mode
    autopair
    ace-jump-mode
+   company
    dired+
    diminish
    expand-region
diff --git a/emacs/init.el b/emacs/init.el
index e674c10..b4f5513 100644
--- a/emacs/init.el
+++ b/emacs/init.el
@@ -296,6 +296,12 @@
             (nconc smart-tab-completion-functions-alist '((php-mode . php-complete-function)))
             (diminish 'smart-tab-mode "")))
 
+(use-package company
+  :commands (company-mode)
+  :bind (("C-<tab>" . company-complete))
+  :init (progn
+          (add-hook 'prog-mode-hook #'company-mode)))
+
 ;;;; Directory browsing
 (use-package dired
   :defer t