diff options
| author | Agustín Martín | 2012-12-03 17:08:23 +0100 |
|---|---|---|
| committer | Agustín Martín | 2012-12-03 17:08:23 +0100 |
| commit | 329bfd64c27f79cb417d8408aaa006179be9cda9 (patch) | |
| tree | ff79dacd434dcb67ff5f248a9a34c6f355446793 | |
| parent | 20edc1c9edbb8c896df0a54769a4da825017de22 (diff) | |
| download | emacs-329bfd64c27f79cb417d8408aaa006179be9cda9.tar.gz emacs-329bfd64c27f79cb417d8408aaa006179be9cda9.zip | |
ispell.el: Fix ispell personal dictionary name expansion.
textmodes/ispell.el (ispell-init-process, ispell-start-process):
Make sure ispell personal dictionary name is expanded after initial
`default-directory' value (Bug#13019).
| -rw-r--r-- | lisp/ChangeLog | 6 | ||||
| -rw-r--r-- | lisp/textmodes/ispell.el | 6 |
2 files changed, 11 insertions, 1 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog index 99038a4adf9..89c10440788 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog | |||
| @@ -1,3 +1,9 @@ | |||
| 1 | 2012-12-03 Agustín Martín Domingo <agustin.martin@hispalinux.es> | ||
| 2 | |||
| 3 | * textmodes/ispell.el (ispell-init-process) | ||
| 4 | (ispell-start-process): Make sure personal dictionary name is | ||
| 5 | expanded after initial `default-directory' value (Bug#13019). | ||
| 6 | |||
| 1 | 2012-12-03 Jay Belanger <jay.p.belanger@gmail.com> | 7 | 2012-12-03 Jay Belanger <jay.p.belanger@gmail.com> |
| 2 | 8 | ||
| 3 | * calc/calc-forms.el (math-date-to-iso-dt): Fix weekday number. | 9 | * calc/calc-forms.el (math-date-to-iso-dt): Fix weekday number. |
diff --git a/lisp/textmodes/ispell.el b/lisp/textmodes/ispell.el index f667525397c..81468fad85f 100644 --- a/lisp/textmodes/ispell.el +++ b/lisp/textmodes/ispell.el | |||
| @@ -2669,7 +2669,8 @@ Keeps argument list for future Ispell invocations for no async support." | |||
| 2669 | orig-args | 2669 | orig-args |
| 2670 | (if ispell-current-personal-dictionary ; Use specified pers dict. | 2670 | (if ispell-current-personal-dictionary ; Use specified pers dict. |
| 2671 | (list "-p" | 2671 | (list "-p" |
| 2672 | (expand-file-name ispell-current-personal-dictionary))) | 2672 | (expand-file-name ispell-current-personal-dictionary |
| 2673 | current-ispell-directory))) | ||
| 2673 | ;; If we are using recent aspell or hunspell, make sure we use the | 2674 | ;; If we are using recent aspell or hunspell, make sure we use the |
| 2674 | ;; right encoding for communication. ispell or older aspell/hunspell | 2675 | ;; right encoding for communication. ispell or older aspell/hunspell |
| 2675 | ;; does not support this. | 2676 | ;; does not support this. |
| @@ -2706,6 +2707,9 @@ Keeps argument list for future Ispell invocations for no async support." | |||
| 2706 | (let* (;; Basename of dictionary used by the spell-checker | 2707 | (let* (;; Basename of dictionary used by the spell-checker |
| 2707 | (dict-bname (or (car (cdr (member "-d" (ispell-get-ispell-args)))) | 2708 | (dict-bname (or (car (cdr (member "-d" (ispell-get-ispell-args)))) |
| 2708 | ispell-current-dictionary)) | 2709 | ispell-current-dictionary)) |
| 2710 | ;; The directory where process was started. | ||
| 2711 | (current-ispell-directory default-directory) | ||
| 2712 | ;; The default directory for the process. | ||
| 2709 | ;; Use "~/" as default-directory unless using Ispell with per-dir | 2713 | ;; Use "~/" as default-directory unless using Ispell with per-dir |
| 2710 | ;; personal dictionaries and not in a minibuffer under XEmacs | 2714 | ;; personal dictionaries and not in a minibuffer under XEmacs |
| 2711 | (default-directory | 2715 | (default-directory |