# HG changeset patch
# User Katsumi Yamaoka <yamaoka@jpl.org>
# Date 1283898548 0
# Node ID ae3d040bbdc9687404d05c80c4ae0e763af5da77
# Parent  63c12314fbd0c2bd6f33fa7411d59da4d5489cc5# Parent  280c5216180d6cc68277b2a8e054ee76bbe7d82d
Merge from mainline.

diff -r 63c12314fbd0 -r ae3d040bbdc9 lisp/ChangeLog
--- a/lisp/ChangeLog	Tue Sep 07 07:46:00 2010 +0000
+++ b/lisp/ChangeLog	Tue Sep 07 22:29:08 2010 +0000
@@ -1,3 +1,8 @@
+2010-09-07  Agustín Martín  <agustin.martin@hispalinux.es>
+
+	* textmodes/ispell.el (ispell-start-process): Make sure original
+	arg list is properly initialized (Bug#6993, Bug#6994).
+
 2010-09-06  Alexander Klimov  <alserkli@inbox.ru>  (tiny change)
 
 	* files.el (directory-abbrev-alist): Use \` as default regexp.
diff -r 63c12314fbd0 -r ae3d040bbdc9 lisp/textmodes/ispell.el
--- a/lisp/textmodes/ispell.el	Tue Sep 07 07:46:00 2010 +0000
+++ b/lisp/textmodes/ispell.el	Tue Sep 07 22:29:08 2010 +0000
@@ -2591,12 +2591,13 @@
                default-directory
              ;; Defend against bad `default-directory'.
              (expand-file-name "~/")))
+	 (orig-args (ispell-get-ispell-args))
          (args
           (append
-           (if (and ispell-current-dictionary ; Use specified dictionary.
-                    (not (member "-d" args))) ; Only define if not overridden.
+           (if (and ispell-current-dictionary      ; Not for default dict (nil)
+                    (not (member "-d" orig-args))) ; Only define if not overridden.
                (list "-d" ispell-current-dictionary))
-           (ispell-get-ispell-args)
+           orig-args
            (if ispell-current-personal-dictionary ; Use specified pers dict.
                (list "-p"
                      (expand-file-name ispell-current-personal-dictionary)))