diff --git a/modules/checkers/spell/README.org b/modules/checkers/spell/README.org index 5312c8d59..f8eea996f 100644 --- a/modules/checkers/spell/README.org +++ b/modules/checkers/spell/README.org @@ -46,7 +46,7 @@ This module has no dedicated maintainers. + [[https://github.com/d12frosted/flyspell-correct][flyspell-correct]] + [[https://github.com/d12frosted/flyspell-correct#flyspell-correct-ivy-interface][flyspell-correct-ivy]] (=completion/ivy=) + [[https://github.com/d12frosted/flyspell-correct#flyspell-correct-helm-interface][flyspell-correct-helm]] (=completion/helm=) - + [[https://github.com/d12frosted/flyspell-correct#flyspell-correct-popup-interface][flyspell-correct-popup]] (if *neither* =completion/ivy= or =completion/helm=) + + [[https://github.com/d12frosted/flyspell-correct#flyspell-correct-popup-interface][flyspell-correct-popup]] (if *neither* =completion/ivy=, =completion/helm= or =completion/selectrum=) + [[https://github.com/rolandwalker/flyspell-lazy][flyspell-lazy]] + else + [[https://gitlab.com/ideasman42/emacs-spell-fu][spell-fu]] diff --git a/modules/checkers/spell/autoload/+spell-fu.el b/modules/checkers/spell/autoload/+spell-fu.el index d90eeeebe..4bddacf8e 100644 --- a/modules/checkers/spell/autoload/+spell-fu.el +++ b/modules/checkers/spell/autoload/+spell-fu.el @@ -62,7 +62,8 @@ (save-current-buffer (ispell-accept-buffer-local-defs)) (if (not (or (featurep! :completion ivy) - (featurep! :completion helm))) + (featurep! :completion helm) + (featurep! :completion selectrum))) (call-interactively #'ispell-word) (cl-destructuring-bind (start . end) (or (bounds-of-thing-at-point 'word) diff --git a/modules/checkers/spell/config.el b/modules/checkers/spell/config.el index aaf5cf4c1..17dc1983e 100644 --- a/modules/checkers/spell/config.el +++ b/modules/checkers/spell/config.el @@ -234,7 +234,8 @@ e.g. proselint and langtool." (require 'flyspell-correct-helm nil t))) ((and (featurep! :completion ivy) (require 'flyspell-correct-ivy nil t))) - ((require 'flyspell-correct-popup nil t) + ((featurep! :completion selectrum)) ; selectrum doesn't need any extra configuration + ((require 'flyspell-correct-popup nil t) ; only use popup if no compatible completion UI is enabled (setq flyspell-popup-correct-delay 0.8) (define-key popup-menu-keymap [escape] #'keyboard-quit)))) diff --git a/modules/checkers/spell/packages.el b/modules/checkers/spell/packages.el index 5917b8d35..359e7a710 100644 --- a/modules/checkers/spell/packages.el +++ b/modules/checkers/spell/packages.el @@ -8,5 +8,6 @@ (package! flyspell-correct-ivy)) ((featurep! :completion helm) (package! flyspell-correct-helm)) - ((package! flyspell-correct-popup))) + ((not (featurep! :completion selectrum)) + (package! flyspell-correct-popup))) (package! flyspell-lazy :pin "0fc5996bcee20b46cbd227ae948d343c3bef7339"))