ispell.el (ispell-get-extended-character-mode): Make sure extended-character-mode...

Work around hunspell not ignoring extended-character-mode
set from pipe mode by making sure extended-character-mode
is nil for hunspell.

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index fa53caf7ba876687227aaeba016af6dd5c7f15fa..2a528033c9cd38d38bb8db6a3521d7e39ac6d25d 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,9 @@
+2012-03-30  Agustín Martín Domingo  <agustin.martin@hispalinux.es>
+
+       * ispell.el (ispell-get-extended-character-mode): Disable
+       extended-char-mode for hunspell. hunspell does not support it and
+       treats ~word as ordinary words in pipe mode.
+
 2012-03-30  Glenn Morris  <rgm@gnu.org>
 
        * tutorial.el (help-with-tutorial): Ensure local variables don't

diff --git a/lisp/textmodes/ispell.el b/lisp/textmodes/ispell.el
index 7df3f8e1ac893c4a46e8e551909e880d3bb84f75..64feaa0aecaefab6cda4cf8cd88af44320a9b045 100644 (file)
--- a/lisp/textmodes/ispell.el
+++ b/lisp/textmodes/ispell.el
@@ -1334,8 +1334,10 @@ Protects against bogus binding of `enable-multibyte-characters' in XEmacs."
   (nth 5 (or (assoc ispell-current-dictionary ispell-local-dictionary-alist)
             (assoc ispell-current-dictionary ispell-dictionary-alist))))
 (defun ispell-get-extended-character-mode ()
-  (nth 6 (or (assoc ispell-current-dictionary ispell-local-dictionary-alist)
-            (assoc ispell-current-dictionary ispell-dictionary-alist))))
+  (if ispell-really-hunspell     ;; hunspell treats ~word as ordinary words
+      nil                        ;; in pipe mode. Disable extended-char-mode
+    (nth 6 (or (assoc ispell-current-dictionary ispell-local-dictionary-alist)
+              (assoc ispell-current-dictionary ispell-dictionary-alist)))))
 (defun ispell-get-coding-system ()
   (nth 7 (or (assoc ispell-current-dictionary ispell-local-dictionary-alist)
             (assoc ispell-current-dictionary ispell-dictionary-alist))))