From 7e40c1ebe360112e5ed2e3e0cf3fc6c464f74b32 Mon Sep 17 00:00:00 2001 From: Henrik Lissner Date: Thu, 2 Apr 2020 00:46:58 -0400 Subject: [PATCH] Fix #2752: self-aborting company-box/docs --- modules/completion/company/config.el | 6 ++++-- modules/lang/emacs-lisp/config.el | 3 --- 2 files changed, 4 insertions(+), 5 deletions(-) diff --git a/modules/completion/company/config.el b/modules/completion/company/config.el index e5a34ea1e..3c30a6de7 100644 --- a/modules/completion/company/config.el +++ b/modules/completion/company/config.el @@ -17,8 +17,10 @@ :config (when (featurep! :editor evil) (add-hook 'company-mode-hook #'evil-normalize-keymaps) - ;; Don't persist company popups when switching back to normal mode. - (add-hook 'evil-normal-state-entry-hook #'company-abort) + (unless (featurep! +childframe) + ;; Don't persist company popups when switching back to normal mode. + ;; `company-box' aborts on mode switch so it doesn't need this. + (add-hook 'evil-normal-state-entry-hook #'company-abort)) ;; Allow users to switch between backends on the fly. E.g. C-x C-s followed ;; by C-x C-n, will switch from `company-yasnippet' to ;; `company-dabbrev-code'. diff --git a/modules/lang/emacs-lisp/config.el b/modules/lang/emacs-lisp/config.el index 6fa67a6d5..d9cd34768 100644 --- a/modules/lang/emacs-lisp/config.el +++ b/modules/lang/emacs-lisp/config.el @@ -48,9 +48,6 @@ This marks a foldable marker for `outline-minor-mode' in elisp buffers.") ;; variable-width indentation is superior in elisp (add-to-list 'doom-detect-indentation-excluded-modes 'emacs-lisp-mode nil #'eq) - ;; Use helpful instead of describe-* from `company' - (advice-add #'elisp--company-doc-buffer :around #'doom-use-helpful-a) - (add-hook! 'emacs-lisp-mode-hook #'outline-minor-mode ;; fontificiation