ryuslash/legacy-dotfiles
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Fix company in non-fci buffers

Browse source
This commit is contained in:
Tom Willemse 2016-03-17 00:39:42 +01:00
parent 94aad9cdb4
commit ec1a9aa30c
1 changed files with 16 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

19
emacs/.emacs.d/init.el
View file

@ -665,9 +665,22 @@ MODE1 is enabled and vice-versa."
;; when it finishes or is cancelled. This is to work around a
;; long-standing incompatibility between company (as well as
;; auto-complete) and fill-column-indicator.
(add-hook 'company-completion-started-hook (lambda (&rest _) (fci-mode -1)))
(add-hook 'company-completion-cancelled-hook (lambda (&rest _) (fci-mode 1)))
(add-hook 'company-completion-finished-hook (lambda (&rest _) (fci-mode 1)))
(defvar-local oni:company-fci-enabled-p nil)
(add-hook 'company-completion-started-hook
(lambda (&rest _)
(when fci-mode
(setq-local oni:company-fci-enabled-p t)
(fci-mode -1))))
(add-hook 'company-completion-cancelled-hook
(lambda (&rest _)
(when oni:company-fci-enabled-p
(fci-mode 1)
(setq-local oni:company-fci-enabled-p nil))))
(add-hook 'company-completion-finished-hook
(lambda (&rest _)
(when oni:company-fci-enabled-p
(fci-mode 1)
(setq-local oni:company-fci-enabled-p nil))))
;; Load my theme
(if (daemonp)