From: Agustín Martín <agustin.martin@hispalinux.es>
Date: Wed, 17 Apr 2013 17:48:10 +0000 (+0200)
Subject: ispell.el: use `comment-normalize-vars' in ispell-add-per-file-word-list (Bug #14214).
X-Git-Tag: emacs-24.3.90~173^2^2~42^2~45^2~387^2~2026^2~439
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=ec7e39f24707268201a444fc4bbc42b2dffae6c5;p=emacs.git

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

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 11666c60c74..cdb8fe5d36c 100644
--- 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 06c3cc68664..94b184d09a1 100644
--- 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)
                                   " ")
                               "")