[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Emacs-diffs] master 25cf501: Revert "Make `ispell-change-dictionary' on
From: |
Lars Ingebrigtsen |
Subject: |
[Emacs-diffs] master 25cf501: Revert "Make `ispell-change-dictionary' only list installed dictionaries" |
Date: |
Tue, 30 Jul 2019 07:19:55 -0400 (EDT) |
branch: master
commit 25cf501c1f86b98ff880b23a48dea66c1a913111
Author: Lars Ingebrigtsen <address@hidden>
Commit: Lars Ingebrigtsen <address@hidden>
Revert "Make `ispell-change-dictionary' only list installed dictionaries"
This reverts commit 848712b481e16f5c96fed6344c2f7d71a8d52ed1.
There could be dictionaries available (set via command-line options for the
speller, for instance) that would not be returned.
---
lisp/textmodes/ispell.el | 19 ++++++++-----------
1 file changed, 8 insertions(+), 11 deletions(-)
diff --git a/lisp/textmodes/ispell.el b/lisp/textmodes/ispell.el
index 0c7fb38..9dfa9f3 100644
--- a/lisp/textmodes/ispell.el
+++ b/lisp/textmodes/ispell.el
@@ -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))
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Emacs-diffs] master 25cf501: Revert "Make `ispell-change-dictionary' only list installed dictionaries",
Lars Ingebrigtsen <=