dev: merge branch 'pr7002' into emenel

modules/config/default/+evil-bindings.el

@@ -163,14 +163,15 @@
        (:after corfu
         (:map corfu-mode-map
          :e "C-M-i" #'completion-at-point
-         (:prefix "C-x"
-          :i "C-l" #'cape-line
-          :i "C-k" #'cape-keyword
-          :i "C-f" #'cape-file
-          :i "s"   #'cape-dict
-          :i "C-s" #'yasnippet-capf
-          :i "C-n" #'cape-dabbrev
-          :i "C-p" #'cape-history)
+         (:when +corfu-want-C-x-bindings
+           (:prefix "C-x"
+            :i "C-l" #'cape-line
+            :i "C-k" #'cape-keyword
+            :i "C-f" #'cape-file
+            :i "s"   #'cape-dict
+            :i "C-s" #'yasnippet-capf
+            :i "C-n" #'cape-dabbrev
+            :i "C-p" #'cape-history))
          (:unless (modulep! :completion corfu +tng)
           :i "C-SPC" #'completion-at-point
           :n "C-SPC" (cmd! (call-interactively #'evil-insert-state)

modules/config/default/config.el

@@ -469,10 +469,10 @@ Continues comments if executed from a commented line. Consults
          (:when (modulep! :completion corfu +orderless)
           [remap completion-at-point] #'+corfu-smart-sep-toggle-escape)
          (:when (modulep! :completion corfu +tng)
-          [tab] #'corfu-next
-          "TAB" #'corfu-next
-          [backtab] #'corfu-previous
-          "S-TAB" #'corfu-previous))
+          :gi [tab] #'corfu-next
+          :gi "TAB" #'corfu-next
+          :gi [backtab] #'corfu-previous
+          :gi "S-TAB" #'corfu-previous))
         (:after corfu-popupinfo
          :map corfu-popupinfo-map
          "C-<up>" #'corfu-popupinfo-scroll-down