procyberian/emacs
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

textmodes/ispell.el (ispell-valid-dictionary-list): Simplify logic.

Browse source
This commit is contained in:
Agustín Martín 2010-09-08 16:54:00 +02:00
parent 0f34aa7719
commit 73b4d51a0a
2 changed files with 14 additions and 11 deletions
Download patch file Download diff file Expand all files Collapse all files

5
lisp/ChangeLog
View file

@ -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.

20
lisp/textmodes/ispell.el
View file

@ -1116,26 +1116,24 @@ The variable `ispell-library-directory' defines the library location."
(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.