Mercurial > emacs
comparison 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 |
comparison
equal
deleted
inserted
replaced
| 110273:63c12314fbd0 | 110274:ae3d040bbdc9 |
|---|---|
| 2589 (if (and (file-directory-p default-directory) | 2589 (if (and (file-directory-p default-directory) |
| 2590 (file-readable-p default-directory)) | 2590 (file-readable-p default-directory)) |
| 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))) |
| 2603 ;; If we are using recent aspell or hunspell, make sure we use the | 2604 ;; If we are using recent aspell or hunspell, make sure we use the |
| 2604 ;; right encoding for communication. ispell or older aspell/hunspell | 2605 ;; right encoding for communication. ispell or older aspell/hunspell |