branch: externals/corfu commit 971de05df4749cb5e7eff0c051ef5cc4c0693537 Author: Daniel Mendler <m...@daniel-mendler.de> Commit: Daniel Mendler <m...@daniel-mendler.de>
Fix corfu-echo and corfu-quick interaction (Fix #252) --- extensions/corfu-echo.el | 2 +- extensions/corfu-quick.el | 3 ++- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/extensions/corfu-echo.el b/extensions/corfu-echo.el index 30c89ec464..feb7edb3be 100644 --- a/extensions/corfu-echo.el +++ b/extensions/corfu-echo.el @@ -67,7 +67,7 @@ floats to specify initial and subsequent delay." (cancel-timer corfu-echo--timer) (setq corfu-echo--timer nil)) (corfu-echo--show msg) - (unless corfu--echo-message + (unless corfu-echo--message (kill-local-variable 'corfu-echo--timer) (kill-local-variable 'corfu-echo--message))) diff --git a/extensions/corfu-quick.el b/extensions/corfu-quick.el index b3dbfc1b3a..5f10a660fc 100644 --- a/extensions/corfu-quick.el +++ b/extensions/corfu-quick.el @@ -124,7 +124,8 @@ TWO is non-nil if two keys should be displayed." (defun corfu-quick-jump () "Jump to candidate using quick keys." (interactive) - (corfu--echo-cancel) + (when (fboundp 'corfu-echo--cancel) + (corfu-echo--cancel)) (if (= corfu--total 0) (and (message "No match") nil) (let ((idx (corfu-quick--read)))