jimeh/.emacs.d
1
0
Fork 0
mirror of https://github.com/jimeh/.emacs.d.git synced 2026-02-19 13:46:41 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix company-mode / fci-mode incompatibility bug

Browse Source 
The original code to fix the incompatibility didn't see to work anymore,
so refactored it a bit to so it goes about things a bit more carefully,
and that seemed to fix it.
This commit is contained in:
Jim Myhrberg
2018-12-20 15:52:33 +00:00
parent 358d5ff1c4
commit 220341a083
1 changed files with 17 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

31
modules/completion/siren-company.el
View File

@@ -6,25 +6,28 @@
;;; Code:
(require 'siren-fci)
;; (require 'siren-fci)
(use-package company
:init
(defun company-turn-off-fci (&rest ignore)
(when (boundp 'fci-mode)
(setq company-fci-mode-on-p fci-mode)
(when fci-mode (fci-mode -1))))
:hook
(company-completion-started . siren-company--turn-off-fci)
(company-completion-finished . siren-company--maybe-turn-on-fci)
(company-completion-cancelled . siren-company--maybe-turn-on-fci)
(defun company-maybe-turn-on-fci (&rest ignore)
(when company-fci-mode-on-p (fci-mode 1)))
:init
(defun siren-company--turn-off-fci (&rest ignore)
(when (boundp 'fci-mode)
(when fci-mode
(turn-off-fci-mode)
(setq siren-company--fci-mode-on-p t))))
(defun siren-company--maybe-turn-on-fci (&rest ignore)
(when siren-company--fci-mode-on-p
(turn-on-fci-mode)
(setq siren-company--fci-mode-on-p nil)))
:config
;; work-around for issues with fci-mode
(defvar-local company-fci-mode-on-p nil)
(add-hook 'company-completion-started-hook 'company-turn-off-fci)
(add-hook 'company-completion-finished-hook 'company-maybe-turn-on-fci)
(add-hook 'company-completion-cancelled-hook 'company-maybe-turn-on-fci)
(defvar-local siren-company--fci-mode-on-p nil)
(setq company-begin-commands '(self-insert-command)
company-dabbrev-downcase nil