dev: merging from pr7739
This commit is contained in:
commit
b50913bc3b
1 changed files with 9 additions and 4 deletions
|
@ -475,13 +475,18 @@ Continues comments if executed from a commented line. Consults
|
||||||
`(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)
|
||||||
((or (not (minibufferp nil t))
|
nil)
|
||||||
(eq +corfu-want-ret-to-confirm t))
|
|
||||||
(when (>= corfu--index 0) cmd))
|
|
||||||
((eq +corfu-want-ret-to-confirm 'minibuffer)
|
((eq +corfu-want-ret-to-confirm 'minibuffer)
|
||||||
(funcall-interactively cmd)
|
(funcall-interactively cmd)
|
||||||
nil)
|
nil)
|
||||||
|
((and (or (not (minibufferp nil t))
|
||||||
|
(eq +corfu-want-ret-to-confirm t))
|
||||||
|
(>= corfu--index 0))
|
||||||
|
cmd)
|
||||||
|
((or (not (minibufferp nil t))
|
||||||
|
(eq +corfu-want-ret-to-confirm t))
|
||||||
|
nil)
|
||||||
(t cmd)))))
|
(t cmd)))))
|
||||||
(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
|
||||||
|
|
Loading…
Add table
Add a link
Reference in a new issue