ispell.el: use `comment-normalize-vars' in ispell-add-per-file-word-list (Bug #14214).

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 11666c60c749b47ab5365db178cb1d1b76e8044e..cdb8fe5d36c6fbec1e6cd57a8984ad173e36daf5 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,10 @@
+2013-04-17  Nicolas Richard  <theonewiththeevillook@yahoo.fr>  (tiny change)
+
+       * textmodes/ispell.el (ispell-add-per-file-word-list):
+       Fix `flyspell-correct-word-before-point' error when accepting
+       words and `coment-padding' is an integer by using
+       `comment-normalize-vars' (Bug #14214).
+
 2013-04-17  Fabián Ezequiel Gallina  <fgallina@gnu.org>
 
        New defun movement commands.

diff --git a/lisp/textmodes/ispell.el b/lisp/textmodes/ispell.el
index 06c3cc68664cb74c884e0feb1eecb6c9ab0e46dc..94b184d09a1cd34cf29b0041327d1a889b35159e 100644 (file)
--- a/lisp/textmodes/ispell.el
+++ b/lisp/textmodes/ispell.el
@@ -4336,8 +4336,13 @@ Both should not be used to define a buffer-local dictionary."
                                   (if (fboundp 'comment-padright)
                                       ;; Try and use the proper comment marker,
                                       ;; e.g. ";;" rather than ";".
-                                      (comment-padright comment-start
-                                                        (comment-add nil))
+                                     (progn
+                                       ;; XEmacs: comment-normalize-vars
+                                       ;; (newcomment.el) only in >= 21.5
+                                       (and (fboundp 'comment-normalize-vars)
+                                            (comment-normalize-vars))
+                                       (comment-padright comment-start
+                                                         (comment-add nil)))
                                     comment-start)
                                   " ")
                               "")