diff options
| author | Agustín Martín | 2010-09-07 20:01:23 +0200 |
|---|---|---|
| committer | Agustín Martín | 2010-09-07 20:01:23 +0200 |
| commit | 308e764f26f61572067a959f6cbf94d7bd3f2e4e (patch) | |
| tree | a7d49526a4851ad76389d22bb8401c1e7fd724f0 | |
| parent | ecc74b38f3bd7dc0d22bd808e07a63373f196424 (diff) | |
| download | emacs-308e764f26f61572067a959f6cbf94d7bd3f2e4e.tar.gz emacs-308e764f26f61572067a959f6cbf94d7bd3f2e4e.zip | |
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).
| -rw-r--r-- | lisp/ChangeLog | 5 | ||||
| -rw-r--r-- | lisp/textmodes/ispell.el | 7 |
2 files changed, 9 insertions, 3 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog index c04b420c087..bfe3534eeb7 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog | |||
| @@ -1,3 +1,8 @@ | |||
| 1 | 2010-09-07 Agustín Martín <agustin.martin@hispalinux.es> | ||
| 2 | |||
| 3 | * textmodes/ispell.el (ispell-start-process): Make sure original | ||
| 4 | arg list is properly initialized (Bug#6993, Bug#6994). | ||
| 5 | |||
| 1 | 2010-09-06 Alexander Klimov <alserkli@inbox.ru> (tiny change) | 6 | 2010-09-06 Alexander Klimov <alserkli@inbox.ru> (tiny change) |
| 2 | 7 | ||
| 3 | * files.el (directory-abbrev-alist): Use \` as default regexp. | 8 | * 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." | |||
| 2591 | default-directory | 2591 | default-directory |
| 2592 | ;; Defend against bad `default-directory'. | 2592 | ;; Defend against bad `default-directory'. |
| 2593 | (expand-file-name "~/"))) | 2593 | (expand-file-name "~/"))) |
| 2594 | (orig-args (ispell-get-ispell-args)) | ||
| 2594 | (args | 2595 | (args |
| 2595 | (append | 2596 | (append |
| 2596 | (if (and ispell-current-dictionary ; Use specified dictionary. | 2597 | (if (and ispell-current-dictionary ; Not for default dict (nil) |
| 2597 | (not (member "-d" args))) ; Only define if not overridden. | 2598 | (not (member "-d" orig-args))) ; Only define if not overridden. |
| 2598 | (list "-d" ispell-current-dictionary)) | 2599 | (list "-d" ispell-current-dictionary)) |
| 2599 | (ispell-get-ispell-args) | 2600 | orig-args |
| 2600 | (if ispell-current-personal-dictionary ; Use specified pers dict. | 2601 | (if ispell-current-personal-dictionary ; Use specified pers dict. |
| 2601 | (list "-p" | 2602 | (list "-p" |
| 2602 | (expand-file-name ispell-current-personal-dictionary))) | 2603 | (expand-file-name ispell-current-personal-dictionary))) |