Mercurial > emacs
changeset 110274:ae3d040bbdc9
Merge from mainline.
| author | Katsumi Yamaoka <yamaoka@jpl.org> |
|---|---|
| date | Tue, 07 Sep 2010 22:29:08 +0000 |
| parents | 63c12314fbd0 (current diff) 280c5216180d (diff) |
| children | f8f2730ec233 |
| files | |
| diffstat | 2 files changed, 9 insertions(+), 3 deletions(-) [+] |
line wrap: on
line diff
--- 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.
--- 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)))