fix(flyspell): escape the + so org src blocks are actually skipped

The skip entry used "#+" (one-or-more #), which matches no real begin_src line, so ispell spell-checked inside every org code block.

2 files changed, 22 insertions, 2 deletions

diff --git a/modules/flyspell-and-abbrev.el b/modules/flyspell-and-abbrev.el
index ebe4898e..d0cdd09c 100644
--- a/modules/flyspell-and-abbrev.el
+++ b/modules/flyspell-and-abbrev.el
@@ -73,8 +73,10 @@
   ;; personal directory goes with sync'd files
   (setq ispell-personal-dictionary
 		(concat org-dir "aspell-personal-dictionary"))
-  ;; skip code blocks in org mode
-  (add-to-list 'ispell-skip-region-alist '("^#+BEGIN_SRC" . "^#+END_SRC")))
+  ;; Skip code blocks in org mode.  The # must be literal and the + escaped:
+  ;; "#+" in regex means one-or-more #, which matches no real begin_src line,
+  ;; so ispell used to spell-check inside every org code block.
+  (add-to-list 'ispell-skip-region-alist '("^#\\+BEGIN_SRC" . "^#\\+END_SRC")))
 
 (use-package flyspell
   :ensure nil ;; built-in
diff --git a/tests/test-flyspell-and-abbrev.el b/tests/test-flyspell-and-abbrev.el
index 3b494d5e..b4be6ab3 100644
--- a/tests/test-flyspell-and-abbrev.el
+++ b/tests/test-flyspell-and-abbrev.el
@@ -17,6 +17,7 @@
 
 (require 'ert)
 (require 'cl-lib)
+(require 'user-constants) ;; org-dir, read by the ispell :config below
 (require 'flyspell)
 (require 'flyspell-and-abbrev)
 
@@ -27,6 +28,23 @@
     (overlay-put o 'face 'flyspell-incorrect)
     o))
 
+;; ------------------------- org src-block skip entry ---------------------------
+
+(ert-deftest test-flyspell-ispell-skip-entry-matches-src-block-lines ()
+  "Normal: the ispell skip entry matches real org src-block delimiters.
+The old entry used \"#+\" (one-or-more #), which matches no real
+begin_src line, so ispell spell-checked inside every org code block."
+  (require 'ispell)
+  (let ((entry (seq-find (lambda (e)
+                           (and (consp e) (stringp (car e))
+                                (string-match-p "BEGIN_SRC" (car e))))
+                         ispell-skip-region-alist)))
+    (should entry)
+    (let ((case-fold-search t))
+      (should (string-match-p (car entry) "#+BEGIN_SRC emacs-lisp"))
+      (should (string-match-p (car entry) "#+begin_src python"))
+      (should (string-match-p (cdr entry) "#+end_src")))))
+
 ;; ------------------------ cj/--require-spell-checker -------------------------
 
 (ert-deftest test-flyspell-require-spell-checker-present ()