[Emacs-diffs] emacs-26 4c3fae3c: Call enchant-lsmod correctly when Enchant is installed with a suffix

[Eli Zaretskii]

branch: emacs-26
commit 4c3fae3cf26d2112f0744f89da93b2440cd45d56
Author: Reuben Thomas <address@hidden>
Commit: Eli Zaretskii <address@hidden>

    Call enchant-lsmod correctly when Enchant is installed with a suffix
    
    * lisp/textmodes/ispell.el (ispell--call-enchant-lsmod): Cope with a
    version suffix on the binary name, so enchant-2 is converted to
    enchant-lsmod-2, not enchant-2-lsmod.  (Bug#31761)
    
    (cherry picked from commit a402d9aacbecf4bf0b9afde592a3b90c71f96832)
---
 lisp/textmodes/ispell.el | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/lisp/textmodes/ispell.el b/lisp/textmodes/ispell.el
index 2b88057..39e8869 100644
--- a/lisp/textmodes/ispell.el
+++ b/lisp/textmodes/ispell.el
@@ -1202,8 +1202,9 @@ Internal use.")
   (with-output-to-string
     (with-current-buffer
         standard-output
-        (apply 'ispell-call-process
-               (concat ispell-program-name "-lsmod") nil t nil args))))
+      (apply 'ispell-call-process
+             (replace-regexp-in-string "enchant\\(-[0-9]\\)?$" 
"enchant-lsmod\\1"
+                                       ispell-program-name) nil t nil args))))
 
 (defun ispell--get-extra-word-characters (&optional lang)
   "Get the extra word characters for LANG as a character class.