Fix some compiler warnings about fci-mode

1 files changed, 3 insertions, 16 deletions

diff --git a/emacs/.emacs.d/init.el b/emacs/.emacs.d/init.el
index a4bab9a..231f404 100644
--- a/emacs/.emacs.d/init.el
+++ b/emacs/.emacs.d/init.el
@@ -646,22 +646,9 @@ 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.
-(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))))
+(add-hook 'company-completion-started-hook 'oni:company-disable-fci-mode)
+(add-hook 'company-completion-cancelled-hook 'oni:company-enable-fci-mode)
+(add-hook 'company-completion-finished-hook 'oni:company-enable-fci-mode)
 
 ;; Load my theme
 (if (daemonp)