fix(default): respect evil-disable-insert-state-bindings

Respect this setting in more places.

Ref: 8c4d871f7c
Ref: 122e3732f7
This commit is contained in:
Henrik Lissner 2024-08-31 15:12:58 -04:00
parent 8c6ee0ed4b
commit ed02241cb8
No known key found for this signature in database
GPG key ID: B60957CA074D39A3

View file

@ -159,8 +159,9 @@
;;; :completion (in-buffer) ;;; :completion (in-buffer)
(map! (:when (modulep! :completion company) (map! (:when (modulep! :completion company)
:i "C-@" (cmds! (not (minibufferp)) #'company-complete-common) (:unless (bound-and-true-p evil-disable-insert-state-bindings)
:i "C-SPC" (cmds! (not (minibufferp)) #'company-complete-common) :i "C-@" (cmds! (not (minibufferp)) #'company-complete-common)
:i "C-SPC" (cmds! (not (minibufferp)) #'company-complete-common))
(:after company (:after company
(:map company-active-map (:map company-active-map
"C-w" nil ; don't interfere with `evil-delete-backward-word' "C-w" nil ; don't interfere with `evil-delete-backward-word'
@ -189,15 +190,18 @@
(:when (modulep! :completion corfu) (:when (modulep! :completion corfu)
(:after corfu (:after corfu
(:map corfu-mode-map (:map corfu-mode-map
:i "C-SPC" #'completion-at-point (:unless (bound-and-true-p evil-disable-insert-state-bindings)
:i "C-n" #'+corfu/dabbrev-or-next :i "C-@" #'completion-at-point
:i "C-p" #'+corfu/dabbrev-or-last :i "C-SPC" #'completion-at-point
:i "C-n" #'+corfu/dabbrev-or-next
:i "C-p" #'+corfu/dabbrev-or-last)
:n "C-SPC" (cmd! (call-interactively #'evil-insert-state) :n "C-SPC" (cmd! (call-interactively #'evil-insert-state)
(call-interactively #'completion-at-point)) (call-interactively #'completion-at-point))
:v "C-SPC" (cmd! (call-interactively #'evil-change) :v "C-SPC" (cmd! (call-interactively #'evil-change)
(call-interactively #'completion-at-point))) (call-interactively #'completion-at-point)))
(:map corfu-map (:map corfu-map
:i "C-SPC" #'corfu-insert-separator (:unless (bound-and-true-p evil-disable-insert-state-bindings)
:i "C-SPC" #'corfu-insert-separator)
"C-k" #'corfu-previous "C-k" #'corfu-previous
"C-j" #'corfu-next "C-j" #'corfu-next
"C-u" (cmd! (let (corfu-cycle) "C-u" (cmd! (let (corfu-cycle)