master f4ef44a5eb: Merge from origin/emacs-28

[Stefan Kangas]

branch: master
commit f4ef44a5ebd6a85f1e546ccfea8cc13e71152032
Merge: 73e1be36e5 5c77aed2d6
Author: Stefan Kangas <stefan@marxist.se>
Commit: Stefan Kangas <stefan@marxist.se>

    Merge from origin/emacs-28
    
    5c77aed2d6 Mention flyspell-prog-mode in flyspell-mode doc string
---
 lisp/textmodes/flyspell.el | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/lisp/textmodes/flyspell.el b/lisp/textmodes/flyspell.el
index 664214419f..5de04b12d4 100644
--- a/lisp/textmodes/flyspell.el
+++ b/lisp/textmodes/flyspell.el
@@ -489,6 +489,9 @@ Flyspell mode is a buffer-local minor mode.  When enabled, 
it
 spawns a single Ispell process and checks each word.  The default
 flyspell behavior is to highlight incorrect words.
 
+This mode is geared toward text modes.  In buffers that contain
+code, `flyspell-prog-mode' is usually a better choice.
+
 Bindings:
 \\[ispell-word]: correct words (using Ispell).
 \\[flyspell-auto-correct-word]: automatically correct word.