Merge pull request #17 from UndeadKernel/fix-complete-line

Enable company mode when asked to autocomplete
This commit is contained in:
Henrik Lissner 2016-11-06 15:17:02 +01:00 committed by GitHub
commit 0a90805fd5

View file

@ -42,6 +42,8 @@
"`company-mode' completion backend that completes whole-lines, akin to vim's "`company-mode' completion backend that completes whole-lines, akin to vim's
C-x C-l." C-x C-l."
(interactive (list 'interactive)) (interactive (list 'interactive))
(require 'company)
(unless (bound-and-true-p company-mode) (company-mode))
(let ((lines (doom--company-whole-lines))) (let ((lines (doom--company-whole-lines)))
(cl-case command (cl-case command
(interactive (company-begin-backend 'doom/company-whole-lines)) (interactive (company-begin-backend 'doom/company-whole-lines))
@ -59,8 +61,8 @@ C-x C-l."
"Bring up the completion popup. If only one result, complete it." "Bring up the completion popup. If only one result, complete it."
(interactive) (interactive)
(require 'company) (require 'company)
(when (and (bound-and-true-p company-mode) (unless (bound-and-true-p company-mode) (company-mode))
(company-manual-begin) (when (and (company-manual-begin)
(= company-candidates-length 1)) (= company-candidates-length 1))
(company-complete-common))) (company-complete-common)))