From: Agustín Martín Date: Tue, 7 Sep 2010 18:01:23 +0000 (+0200) Subject: Make sure original ispell arg list is initialized in (ispell-start-process). X-Git-Tag: emacs-pretest-24.0.90~104^2~275^2~438^2~48^2~42 X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=308e764f26f61572067a959f6cbf94d7bd3f2e4e;p=emacs.git Make sure original ispell arg list is initialized in (ispell-start-process). * textmodes/ispell.el (ispell-start-process): Make sure original arg list is properly initialized (Bug#6993, Bug#6994). --- diff --git a/lisp/ChangeLog b/lisp/ChangeLog index c04b420c087..bfe3534eeb7 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog @@ -1,3 +1,8 @@ +2010-09-07 Agustín Martín + + * textmodes/ispell.el (ispell-start-process): Make sure original + arg list is properly initialized (Bug#6993, Bug#6994). + 2010-09-06 Alexander Klimov (tiny change) * files.el (directory-abbrev-alist): Use \` as default regexp. diff --git a/lisp/textmodes/ispell.el b/lisp/textmodes/ispell.el index e30da02df4f..0e853cc3ccd 100644 --- a/lisp/textmodes/ispell.el +++ b/lisp/textmodes/ispell.el @@ -2591,12 +2591,13 @@ Keeps argument list for future ispell invocations for no async support." 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)))