Fix ispell’s handling of comment-end when adding local words

* lisp/textmodes/ispell.el (ispell-add-per-file-word-list): Deal
with `comment-end' in a way that works for comments that don’t
nest.

We proceed as follows: when `comment-end' is non-empty, we only
ever insert one start and one end comment, the first time we add
a local word.  This works with both C-style (which don’t nest)
and Rust-style comments (which do).

If we’re using line comments (i.e. comments that only have a
`comment-start'), then continue to insert one on each line.

* test/lisp/textmodes/ispell-tests/ispell-tests.el
(ispell/ispell-add-per-file-word-list/nxml): Adjust test.

Bug#79871

1 files changed, 4 insertions, 6 deletions

diff --git a/test/lisp/textmodes/ispell-tests/ispell-tests.el b/test/lisp/textmodes/ispell-tests/ispell-tests.el
index b43d32ae95d..8f733d05d2c 100644
--- a/test/lisp/textmodes/ispell-tests/ispell-tests.el
+++ b/test/lisp/textmodes/ispell-tests/ispell-tests.el
@@ -393,7 +393,8 @@ xml comment syntax, which has an opening and a closing marker."
       (ispell-add-per-file-word-list testword)
       (should (equal (buffer-string)
                      (concat "
-<!-- " ispell-words-keyword " " testword "
+<!--
+" ispell-words-keyword " " testword "
 -->
 "))))))
 
@@ -421,7 +422,6 @@ Uses default
 xml comment syntax, which has an opening and a closing marker.
 This test fails, because ispell.el does not work well with
 nXML comments."
-  :expected-result :failed
   (ispell-tests--letopt ((ispell-program-name "ispell"))
     (with-temp-buffer
       (let* ((testword (format "%s" (random)))
@@ -434,11 +434,9 @@ nXML comments."
         (ispell-add-per-file-word-list testword)
         (should (equal (buffer-string)
                        (concat "
-<!-- " ispell-words-keyword (make-string fill-column ?a) "
--->
-"
+<!-- " ispell-words-keyword (make-string fill-column ?a)
 "
-<!-- " ispell-words-keyword " " testword "
+" ispell-words-keyword " " testword "
 -->
 ")))))))