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

dev: merge branch 'pr7739' into emenel

Browse source
This commit is contained in:
Matt Nish-Lapidus 2024-03-24 10:03:07 -04:00
commit 790c512387
1 changed files with 41 additions and 37 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -468,13 +468,15 @@ Continues comments if executed from a commented line. Consults
(let ((cmds-del (let ((cmds-del
`(menu-item "Reset completion" corfu-reset `(menu-item "Reset completion" corfu-reset
:filter ,(lambda (cmd) :filter ,(lambda (cmd)
(when (and (>= corfu--index 0) (cond
((and (>= corfu--index 0)
(eq corfu-preview-current 'insert)) (eq corfu-preview-current 'insert))
cmd)))) cmd)))))
(cmds-ret (cmds-ret
`(menu-item "Insert completion DWIM" corfu-insert `(menu-item "Insert completion DWIM" corfu-insert
:filter ,(lambda (cmd) :filter ,(lambda (cmd)
(cond ((null +corfu-want-ret-to-confirm) (cond
((null +corfu-want-ret-to-confirm)
(corfu-quit) (corfu-quit)
nil) nil)
((eq +corfu-want-ret-to-confirm 'minibuffer) ((eq +corfu-want-ret-to-confirm 'minibuffer)
@ -491,7 +493,8 @@ Continues comments if executed from a commented line. Consults
(cmds-tab (cmds-tab
`(menu-item "Select next candidate or expand/traverse snippet" corfu-next `(menu-item "Select next candidate or expand/traverse snippet" corfu-next
:filter (lambda (cmd) :filter (lambda (cmd)
(cond ,@(when (modulep! :editor snippets) (cond
,@(when (modulep! :editor snippets)
'(((and +corfu-want-tab-prefer-navigating-snippets '(((and +corfu-want-tab-prefer-navigating-snippets
(+yas-active-p)) (+yas-active-p))
#'yas-next-field-or-maybe-expand) #'yas-next-field-or-maybe-expand)
@ -507,7 +510,8 @@ Continues comments if executed from a commented line. Consults
`(menu-item "Select previous candidate or expand/traverse snippet" `(menu-item "Select previous candidate or expand/traverse snippet"
corfu-previous corfu-previous
:filter (lambda (cmd) :filter (lambda (cmd)
(cond ,@(when (modulep! :editor snippets) (cond
,@(when (modulep! :editor snippets)
'(((and +corfu-want-tab-prefer-navigating-snippets '(((and +corfu-want-tab-prefer-navigating-snippets
(+yas-active-p)) (+yas-active-p))
#'yas-prev-field))) #'yas-prev-field)))