mirror/emacs
1
0
Fork 0
mirror of https://git.savannah.gnu.org/git/emacs.git synced 2024-12-03 08:30:09 +00:00
Code Issues Releases Activity

Revert "Make `ispell-change-dictionary' only list installed dictionaries"

Browse Source 
This reverts commit 848712b481.

There could be dictionaries available (set via command-line options for the
speller, for instance) that would not be returned.
This commit is contained in:
Lars Ingebrigtsen 2019-07-30 13:18:36 +02:00
parent 74c5d688bb
commit 25cf501c1f
1 changed files with 8 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
lisp/textmodes/ispell.el
View File

@ -851,13 +851,11 @@ Internal use.")
;; Ensure aspell's alias dictionary will override standard
;; definitions.
(setq found (ispell-aspell-add-aliases found))
;; Merge into FOUND any elements from the standard
;; ispell-dictionary-base-alist which have no element in FOUND at
;; all.
(unless found
(dolist (dict ispell-dictionary-base-alist)
(unless (assoc (car dict) found)
(setq found (nconc found (list dict))))))
;; Merge into FOUND any elements from the standard ispell-dictionary-base-alist
;; which have no element in FOUND at all.
(dolist (dict ispell-dictionary-base-alist)
(unless (assoc (car dict) found)
(setq found (nconc found (list dict)))))
(setq ispell-aspell-dictionary-alist found)
;; Add a default entry
(let ((default-dict
@ -1297,7 +1295,8 @@ aspell is used along with Emacs).")
;; Substitute ispell-dictionary-alist with the list of
;; dictionaries corresponding to the given spellchecker.
;; With programs that support it, use the list of really
;; installed dictionaries. Allow distro info.
;; installed dictionaries and add to it elements of the original
;; list that are not present there. Allow distro info.
(let ((found-dicts-alist
(if ispell-encoding8-command
(if ispell-really-aspell
@ -1364,9 +1363,7 @@ aspell is used along with Emacs).")
;; Add dicts to `ispell-dictionary-alist' unless already present.
(dolist (dict (append found-dicts-alist
ispell-base-dicts-override-alist
(if found-dicts-alist
nil
ispell-dictionary-base-alist)))
ispell-dictionary-base-alist))
(unless (assoc (car dict) all-dicts-alist)
(push dict all-dicts-alist)))
(setq ispell-dictionary-alist all-dicts-alist))