[Emacs-diffs] /srv/bzr/emacs/emacs-24 r107799: Fix invocation of Hunspell by ispell.el.

[Eli Zaretskii]

------------------------------------------------------------
revno: 107799
committer: Eli Zaretskii <address@hidden>
branch nick: trunk
timestamp: Sun 2012-04-08 20:09:03 +0300
message:
  Fix invocation of Hunspell by ispell.el.
  
   lisp/textmodes/ispell.el (ispell-check-version): For hunspell, set
   ispell-encoding8-command to "-i", without a trailing space.
   (ispell-start-process): For hunspell, use '("-i" ENCODING), in 2
   separate command-line arguments, to specify the encoding, since
   that's how hunspell expects it.
modified:
  lisp/ChangeLog
  lisp/textmodes/ispell.el

=== modified file 'lisp/ChangeLog'
--- a/lisp/ChangeLog    2012-04-08 01:54:52 +0000
+++ b/lisp/ChangeLog    2012-04-08 17:09:03 +0000
@@ -1,3 +1,11 @@
+2012-04-08  Eli Zaretskii  <address@hidden>
+
+       * textmodes/ispell.el (ispell-check-version): For hunspell, set
+       ispell-encoding8-command to "-i", without a trailing space.
+       (ispell-start-process): For hunspell, use '("-i" ENCODING), in 2
+       separate command-line arguments, to specify the encoding, since
+       that's how hunspell expects it.
+
 2012-04-08  Glenn Morris  <address@hidden>
 
        * loadup.el: Load bindings before cus-start.

=== modified file 'lisp/textmodes/ispell.el'
--- a/lisp/textmodes/ispell.el  2012-03-30 09:45:11 +0000
+++ b/lisp/textmodes/ispell.el  2012-04-08 17:09:03 +0000
@@ -874,7 +874,7 @@
            (setq ispell-really-aspell nil)))
         (ispell-really-hunspell
          (if (ispell-check-minver hunspell8-minver ispell-really-hunspell)
-             (setq ispell-encoding8-command "-i ")
+             (setq ispell-encoding8-command "-i")
            (setq ispell-really-hunspell nil))))))
     result))
 
@@ -2618,9 +2618,12 @@
            ;; right encoding for communication. ispell or older aspell/hunspell
            ;; does not support this.
            (if ispell-encoding8-command
-               (list
-                (concat ispell-encoding8-command
-                        (symbol-name (ispell-get-coding-system)))))
+              (if ispell-really-hunspell
+                  (list ispell-encoding8-command
+                        (upcase (symbol-name (ispell-get-coding-system))))
+                (list
+                 (concat ispell-encoding8-command
+                         (symbol-name (ispell-get-coding-system))))))
            ispell-extra-args)))
 
     ;; Initially we don't know any buffer's local words.