Mercurial > emacs
changeset 110265:737d37e262a1
textmodes/ispell.el (ispell-valid-dictionary-list): Simplify logic.
| author | Agustin martin <agustin.martin@hispalinux.es> |
|---|---|
| date | Wed, 08 Sep 2010 16:54:00 +0200 |
| parents | ec526909f60b |
| children | 5086e18330fb |
| files | lisp/ChangeLog lisp/textmodes/ispell.el |
| diffstat | 2 files changed, 14 insertions(+), 11 deletions(-) [+] |
line wrap: on
line diff
--- a/lisp/ChangeLog Wed Sep 08 16:42:54 2010 +0200 +++ b/lisp/ChangeLog Wed Sep 08 16:54:00 2010 +0200 @@ -1,3 +1,8 @@ +2010-09-08 Agustín Martín <agustin.martin@hispalinux.es> + + * textmodes/ispell.el (ispell-valid-dictionary-list): + Simplify logic. + 2010-09-08 Michael Albinus <michael.albinus@gmx.de> Migrate to Tramp 2.2. Rearrange load dependencies.
--- a/lisp/textmodes/ispell.el Wed Sep 08 16:42:54 2010 +0200 +++ b/lisp/textmodes/ispell.el Wed Sep 08 16:54:00 2010 +0200 @@ -1116,26 +1116,24 @@ (let ((dicts (append ispell-local-dictionary-alist ispell-dictionary-alist)) (dict-list (cons "default" nil)) - name load-dict) + name dict-bname) (dolist (dict dicts) (setq name (car dict) - load-dict (car (cdr (member "-d" (nth 5 dict))))) + dict-bname (or (car (cdr (member "-d" (nth 5 dict)))) + name)) ;; Include if the dictionary is in the library, or dir not defined. (if (and name - ;; include all dictionaries if lib directory not known. ;; For Aspell, we already know which dictionaries exist. (or ispell-really-aspell + ;; Include all dictionaries if lib directory not known. + ;; Same for Hunspell, where ispell-library-directory is nil. (not ispell-library-directory) (file-exists-p (concat ispell-library-directory - "/" name ".hash")) - (file-exists-p (concat ispell-library-directory "/" name ".has")) - (and load-dict - (or (file-exists-p (concat ispell-library-directory - "/" load-dict ".hash")) - (file-exists-p (concat ispell-library-directory - "/" load-dict ".has")))))) - (setq dict-list (cons name dict-list)))) + "/" dict-bname ".hash")) + (file-exists-p (concat ispell-library-directory + "/" dict-bname ".has")))) + (push name dict-list))) dict-list)) ;;; define commands in menu in opposite order you want them to appear.