dev: erge branch 'pr7002' into emenel

This commit is contained in:
Matt Nish-Lapidus 2024-02-03 11:14:50 -05:00
commit f8d06642da
3 changed files with 12 additions and 2 deletions

View file

@ -107,7 +107,7 @@ following additional binds:
In the minibuffer, sometimes autocompletion can interfere with your goal; In the minibuffer, sometimes autocompletion can interfere with your goal;
Imagine you're composing a search pattern incrementally, and you find what you Imagine you're composing a search pattern incrementally, and you find what you
want early, with only half the word. You then press [[kbd:RET]]. If completion want early, with only half the word. You then press [[kbd:RET]]. If completion
kicked in as you typed, you may loose the match, since it will complete the kicked in as you typed, you may lose the match, since it will complete the
first candidate. On the other hand, if you were paying attention to the first candidate. On the other hand, if you were paying attention to the
suggestions and selecting one appropriate, that's desired behavior, and you may suggestions and selecting one appropriate, that's desired behavior, and you may
even desire to modify the prompt further (if you were composing a command even desire to modify the prompt further (if you were composing a command

View file

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

View file

@ -460,6 +460,16 @@ Continues comments if executed from a commented line. Consults
(map! :when (modulep! :completion corfu) (map! :when (modulep! :completion corfu)
:after corfu :after corfu
(:map corfu-mode-map
:prefix "C-x"
"C-l" #'cape-line
"C-k" #'cape-keyword
"C-f" #'cape-file
"s" #'cape-dict
"C-s" #'yasnippet-capf
"C-o" #'completion-at-point
"C-n" #'cape-dabbrev
"C-p" #'cape-history)
(:map corfu-map (:map corfu-map
[return] #'corfu-insert [return] #'corfu-insert
"RET" #'corfu-insert "RET" #'corfu-insert