still tweaking company's config

1 files changed, 5 insertions, 1 deletions

diff --git a/init.org b/init.org
index 804e319..2bc8b50 100644
--- a/init.org
+++ b/init.org
@@ -880,6 +880,9 @@
                ;; explicitly interacted with Company.
                :map company-active-map
 
+               ([remap scroll-up-command] . nil)
+               ([remap scroll-down-command] . nil)
+
                ;; Make TAB always complete the current selection, instead of
                ;; only completing a common prefix.
                ("<tab>" . #'company-complete-selection)
@@ -893,7 +896,8 @@
                ;; "sticky", and applies also below.
                ;; Another interesting :filter  (company-explicit-action-p)
 
-               :filter (not (derived-mode-p 'eshell-mode))
+               :filter (or (not (derived-mode-p 'eshell-mode))
+                           (company-explicit-action-p))
                ("<return>" . #'company-complete-selection)
                ("RET" . #'company-complete-selection))