emenel/doomemacs
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

dev: merge branch 'pr7002' into emenel

Browse source
This commit is contained in:
Matt Nish-Lapidus 2024-02-18 11:02:23 -05:00
commit 17b109158d
3 changed files with 9 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

1
modules/completion/corfu/config.el
View file

@ -6,7 +6,6 @@
;; ;;
;;; Packages ;;; Packages
(use-package! corfu (use-package! corfu
:defer t
:hook (doom-first-input . global-corfu-mode) :hook (doom-first-input . global-corfu-mode)
:config :config
(setq corfu-auto t (setq corfu-auto t

2
modules/config/default/+emacs-bindings.el
View file

@ -542,7 +542,7 @@
(:map corfu-mode-map (:map corfu-mode-map
"C-M-i" #'completion-at-point) "C-M-i" #'completion-at-point)
(:map corfu-popupinfo-map (:map corfu-popupinfo-map
"C-S-h" #'corfu-popupinfo-toggle)) "C-S-h" #'corfu-popupinfo-toggle))
;;; ein notebooks ;;; ein notebooks
(:after ein:notebook-multilang (:after ein:notebook-multilang

16
modules/config/default/config.el
View file

@ -467,7 +467,7 @@ Continues comments if executed from a commented line. Consults
"C-p" #'corfu-previous "C-p" #'corfu-previous
"C-n" #'corfu-next "C-n" #'corfu-next
(:when (modulep! :completion corfu +orderless) (:when (modulep! :completion corfu +orderless)
"<remap> <completion-at-point>" #'+corfu-smart-sep-toggle-escape) [remap completion-at-point] #'+corfu-smart-sep-toggle-escape)
(:when (modulep! :completion corfu +tng) (:when (modulep! :completion corfu +tng)
[tab] #'corfu-next [tab] #'corfu-next
"TAB" #'corfu-next "TAB" #'corfu-next
@ -482,14 +482,14 @@ Continues comments if executed from a commented line. Consults
"C-S-u" (cmd! (funcall-interactively #'corfu-popupinfo-scroll-down corfu-popupinfo-min-height)) "C-S-u" (cmd! (funcall-interactively #'corfu-popupinfo-scroll-down corfu-popupinfo-min-height))
"C-S-d" (cmd! (funcall-interactively #'corfu-popupinfo-scroll-up corfu-popupinfo-min-height))) "C-S-d" (cmd! (funcall-interactively #'corfu-popupinfo-scroll-up corfu-popupinfo-min-height)))
(:map corfu-map (:map corfu-map
:gi "C-<return>" '(menu-item "Conclude the minibuffer" exit-minibuffer "C-<return>" '(menu-item "Conclude the minibuffer" exit-minibuffer
:enable (active-minibuffer-window)) :enable (minibufferp nil t))
:gi "S-<return>" '(menu-item "Insert completion and conclude" +corfu-complete-and-exit-minibuffer "S-<return>" '(menu-item "Insert completion and conclude" +corfu-complete-and-exit-minibuffer
:enable (active-minibuffer-window)))) :enable (minibufferp nil t))))
(when-let ((cmds-del (and (modulep! :completion corfu +tng) (when-let ((cmds-del (and (modulep! :completion corfu +tng)
(cmds! (and (> corfu--index -1) '(menu-item "Reset completion" #'corfu-reset
(eq corfu-preview-current 'insert)) :enable (and (> corfu--index -1)
#'corfu-reset)))) (eq corfu-preview-current 'insert))))))
(map! :after corfu (map! :after corfu
:map corfu-map :map corfu-map
[backspace] cmds-del [backspace] cmds-del