From: Glenn Morris <rgm@gnu.org>
Date: Sun, 2 Dec 2007 18:17:08 +0000 (+0000)
Subject: Agustín Martín  <agustin.martin at hispalinux.es>
X-Git-Tag: emacs-pretest-23.0.90~9162
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=acf7984c5b5afe6d6c2c16d47bb9da9308624221;p=emacs.git

Agustín Martín  <agustin.martin at hispalinux.es>

(ispell-aspell-find-dictionary): Do not set encoding here.
(ispell-start-process): Explicitly set encoding here if using aspell.
---

diff --git a/lisp/textmodes/ispell.el b/lisp/textmodes/ispell.el
index 444cf1985e8..7fb6aed139a 100644
--- a/lisp/textmodes/ispell.el
+++ b/lisp/textmodes/ispell.el
@@ -981,7 +981,7 @@ Assumes that value contains no whitespace."
 		"[^[:alpha:]]"
 		(regexp-opt otherchars)
 		t			     ; We can't tell, so set this to t
-		(list "-d" dict-name "--encoding=utf-8")
+		(list "-d" dict-name)
 		nil				; aspell doesn't support this
 		;; Here we specify the encoding to use while communicating with
 		;; aspell.  This doesn't apply to command line arguments, so
@@ -2511,6 +2511,13 @@ Keeps argument list for future ispell invocations for no async support."
 	      (append args
 		      (list "-p"
 			    (expand-file-name ispell-current-personal-dictionary)))))
+    (if (and ispell-really-aspell
+	     ispell-aspell-supports-utf8)
+	(setq args
+	      (append args
+		      (list
+		       (concat "--encoding="
+			       (symbol-name (ispell-get-coding-system)))))))
     (setq args (append args ispell-extra-args))
 
     ;; Initially we don't know any buffer's local words.