Merge from trunk.

2 files changed, 13 insertions, 0 deletions

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 10570c2a878..68a85a43387 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,8 @@
+2011-10-13  Agustín Martín Domingo  <agustin.martin@hispalinux.es>
+
+        * textmodes/flyspell.el (flyspell-large-region): Make sure
+        extended character mode is used if defined (Bug#1339).
+
 2011-10-13  Eli Zaretskii  <eliz@gnu.org>
 
         * simple.el (what-cursor-position): Fix the display of the
diff --git a/lisp/textmodes/flyspell.el b/lisp/textmodes/flyspell.el
index c2af3f7be84..d496298768d 100644
--- a/lisp/textmodes/flyspell.el
+++ b/lisp/textmodes/flyspell.el
@@ -1559,6 +1559,14 @@ The buffer to mark them in is `flyspell-large-region-buffer'."
                         (list "-p"
                               (expand-file-name
                                ispell-current-personal-dictionary)))))
+
+      ;; Check for extended character mode
+      (let ((extended-char-mode (ispell-get-extended-character-mode)))
+        (and extended-char-mode          ; ~ extended character mode
+             (string-match "[^~]+$" extended-char-mode)
+             (add-to-list 'args (concat "-T" (match-string 0 extended-char-mode)))))
+
+      ;; Add ispell-extra-args
       (setq args (append args ispell-extra-args))
 
       ;; If we are using recent aspell or hunspell, make sure we use the right encoding