summaryrefslogtreecommitdiffstats
path: root/emacs/.emacs.d/init.el
diff options
context:
space:
mode:
Diffstat (limited to 'emacs/.emacs.d/init.el')
-rw-r--r--emacs/.emacs.d/init.el18
1 files changed, 17 insertions, 1 deletions
diff --git a/emacs/.emacs.d/init.el b/emacs/.emacs.d/init.el
index 3832785..e2ed37b 100644
--- a/emacs/.emacs.d/init.el
+++ b/emacs/.emacs.d/init.el
@@ -190,6 +190,13 @@ MODE1 is enabled and vice-versa."
(with-eval-after-load 'cc-mode
(define-key c-mode-map (kbd "<f9>") 'compile))
+(stante-after company
+ (setq company-frontends
+ '(company-pseudo-tooltip-unless-just-one-frontend
+ company-echo-metadata-frontend
+ company-preview-frontend))
+ (setq company-idle-delay 0.2))
+
(stante-after compile
(setq compilation-scroll-output t))
@@ -654,6 +661,14 @@ MODE1 is enabled and vice-versa."
(oni:add-hooks 'text-mode-hook
#'auto-fill-mode #'flyspell-mode 'oni:make-readable)
+;; Turn off FCI when company completion starts and turn it on again
+;; 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)))
+
;; Load my theme
(if (daemonp)
(add-hook 'after-make-frame-functions 'oni:set-theme-graphically)
@@ -753,7 +768,8 @@ MODE1 is enabled and vice-versa."
(desktop-registry-auto-register)
(yas-global-mode)
(projectile-global-mode)
- (hes-mode))
+ (hes-mode)
+ (global-company-mode))
(with-eval-after-load 'ruby
(global-rinari-mode))