From: Reuben Thomas <rrt@sc3d.org>
Date: Fri, 4 Sep 2020 00:58:04 +0000 (+0100)
Subject: Add enchant-2 to list of default spelling checker programs
X-Git-Tag: emacs-28.0.90~6208
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=7d567981c8bef27e9b8482f2aeb0932d31c6f973;p=emacs.git

Add enchant-2 to list of default spelling checker programs

* lisp/textmodes/ispell.el (ispell-program-name): Check `enchant-2',
as it is likely to be a suitable version.
---

diff --git a/lisp/textmodes/ispell.el b/lisp/textmodes/ispell.el
index 86452ff1e87..11f90f41a8b 100644
--- a/lisp/textmodes/ispell.el
+++ b/lisp/textmodes/ispell.el
@@ -198,14 +198,13 @@ Must be greater than 1."
   :type 'integer
   :group 'ispell)
 
-;; XXX Add enchant to this list once enchant >= 2.1.0 is widespread.
-;; Before that, adding it is useless, as if it is found, it will just
-;; cause an error; and one of the other spelling engines below is
-;; almost certainly installed in any case, for enchant to use.
 (defcustom ispell-program-name
   (or (executable-find "aspell")
       (executable-find "ispell")
       (executable-find "hunspell")
+      ;; Enchant is commonly installed as `enchant-2', so use this
+      ;; name and avoid old versions of `enchant'.
+      (executable-find "enchant-2")
       "ispell")
   "Program invoked by \\[ispell-word] and \\[ispell-region] commands."
   :type 'string
@@ -330,7 +329,7 @@ The function must take one string argument and return a string."
   :group 'ispell)
 
 ;; FIXME framepop.el last updated c 2003 (?),
-;; probably something else replaces it these days.
+;; use posframe.
 (defcustom ispell-use-framepop-p nil
   "When non-nil ispell uses framepop to display choices in a dedicated frame.
 You can set this variable to dynamically use framepop if you are in a