From bfd71a8bb9da54eb42470511268ca4760d91a05f Mon Sep 17 00:00:00 2001 From: Henrik Lissner Date: Wed, 26 Aug 2020 19:31:09 -0400 Subject: [PATCH] Fix #3827: void-variable flyspell-delayed-commands This occurs in org-compat.el: (eval-after-load "flyspell" '(add-to-list 'flyspell-delayed-commands 'org-self-insert-command)) By not using a package symbol, this code runs whenever any file named flyspell.el is loaded. Guess what one of the :checkers spell module's autoloads files is named? flyspell.el --- .../spell/autoload/{flyspell.el => +flyspell.el} | 2 +- .../spell/autoload/{spell-fu.el => +spell-fu.el} | 10 +++++----- 2 files changed, 6 insertions(+), 6 deletions(-) rename modules/checkers/spell/autoload/{flyspell.el => +flyspell.el} (92%) rename modules/checkers/spell/autoload/{spell-fu.el => +spell-fu.el} (92%) diff --git a/modules/checkers/spell/autoload/flyspell.el b/modules/checkers/spell/autoload/+flyspell.el similarity index 92% rename from modules/checkers/spell/autoload/flyspell.el rename to modules/checkers/spell/autoload/+flyspell.el index 24abd42e1..74b2dd33d 100644 --- a/modules/checkers/spell/autoload/flyspell.el +++ b/modules/checkers/spell/autoload/+flyspell.el @@ -1,4 +1,4 @@ -;;; checkers/spell/autoload/flyspell.el -*- lexical-binding: t; -*- +;;; checkers/spell/autoload/+flyspell.el -*- lexical-binding: t; -*- ;;;###if (featurep! +flyspell) ;;;###autodef diff --git a/modules/checkers/spell/autoload/spell-fu.el b/modules/checkers/spell/autoload/+spell-fu.el similarity index 92% rename from modules/checkers/spell/autoload/spell-fu.el rename to modules/checkers/spell/autoload/+spell-fu.el index 86c4bfde4..1049a8a28 100644 --- a/modules/checkers/spell/autoload/spell-fu.el +++ b/modules/checkers/spell/autoload/+spell-fu.el @@ -1,4 +1,4 @@ -;;; checkers/spell/autoload/spell-fu.el -*- lexical-binding: t; -*- +;;; checkers/spell/autoload/+spell-fu.el -*- lexical-binding: t; -*- ;;;###if (not (featurep! +flyspell)) (defun +spell--correct (replace poss word orig-pt start end) @@ -50,10 +50,10 @@ (defun +spell/correct () "Correct spelling of word at point." (interactive) - ;; We fake awareness for our personal dictionary by stopping short if spell-fu - ;; hasn't highlighted the current word. This is necessary because - ;; ispell/aspell struggles to find our `ispell-personal-dictionary' if it's - ;; not in $HOME. + ;; HACK Fake awareness for our personal dictionary by stopping short if + ;; spell-fu hasn't highlighted the current word. This is necessary + ;; because ispell/aspell struggles to find our + ;; `ispell-personal-dictionary' if it's not in $HOME. (unless (memq 'spell-fu-incorrect-face (face-at-point nil t)) (user-error "%S is correct" (thing-at-point 'word t))) (ispell-set-spellchecker-params)