From a31dced7bc7009fd1fd2e5a0d2bf20b505b25baa Mon Sep 17 00:00:00 2001
From: Ian Wahbe <ian@wahbe.com>
Date: Fri, 13 Nov 2020 20:51:54 +0100
Subject: [PATCH] Requested changes -- move defvar to preface

We can now remove the redundant hack.
---
 modules/checkers/spell/autoload/+spell-fu.el |  6 ------
 modules/checkers/spell/config.el             | 13 ++++++-------
 2 files changed, 6 insertions(+), 13 deletions(-)

diff --git a/modules/checkers/spell/autoload/+spell-fu.el b/modules/checkers/spell/autoload/+spell-fu.el
index cf65b39fe..25a0a1063 100644
--- a/modules/checkers/spell/autoload/+spell-fu.el
+++ b/modules/checkers/spell/autoload/+spell-fu.el
@@ -57,12 +57,6 @@
            or (and ispell-really-aspell ispell-program-name)
               (executable-find "aspell"))
     (user-error "Aspell is required for spell checking"))
-  ;; HACK When spell-fu fails to initialize correctly, the init form for the
-  ;;      spell-fu use-package! is not called. This leaves emacs to assume that
-  ;;      certain variables are initialized when they are not. We bind what we
-  ;;      need.
-  (unless (boundp '+spell-correct-interface)
-    (+spell-defun-correct-interface))
 
   (ispell-set-spellchecker-params)
   (save-current-buffer
diff --git a/modules/checkers/spell/config.el b/modules/checkers/spell/config.el
index 68273c8f3..b28bc4b05 100644
--- a/modules/checkers/spell/config.el
+++ b/modules/checkers/spell/config.el
@@ -70,21 +70,20 @@
 
 (eval-if! (not (featurep! +flyspell))
 
-    (defun +spell-defun-correct-interface ()
+    (use-package! spell-fu
+      :when (executable-find "aspell")
+      :hook (text-mode . spell-fu-mode)
+      :general ([remap ispell-word] #'+spell/correct)
+      :preface
       (defvar +spell-correct-interface
         (cond ((featurep! :completion ivy)
                #'+spell-correct-ivy-fn)
               ((featurep! :completion helm)
                #'+spell-correct-helm-fn)
               (#'+spell-correct-generic-fn))
-        "Function to use to display corrections."))
+        "Function to use to display corrections.")
 
-    (use-package! spell-fu
-      :when (executable-find "aspell")
-      :hook (text-mode . spell-fu-mode)
-      :general ([remap ispell-word] #'+spell/correct)
       :init
-      (+spell-defun-correct-interface)
       (defvar +spell-excluded-faces-alist
         '((markdown-mode
            . (markdown-code-face