Mercurial > emacs
diff lisp/textmodes/ispell.el @ 110274:ae3d040bbdc9
Merge from mainline.
author | Katsumi Yamaoka <yamaoka@jpl.org> |
---|---|
date | Tue, 07 Sep 2010 22:29:08 +0000 |
parents | 280c5216180d |
children | 737d37e262a1 |
line wrap: on
line diff
--- 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)))