]> git.eshelyaron.com Git - emacs.git/commitdiff
Call enchant-lsmod correctly when Enchant is installed with a suffix
authorReuben Thomas <rrt@sc3d.org>
Fri, 16 Mar 2018 10:50:21 +0000 (10:50 +0000)
committerEli Zaretskii <eliz@gnu.org>
Sun, 10 Jun 2018 16:53:39 +0000 (19:53 +0300)
* 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

index 2b88057dc4f0cfe38bae67fc2bfc0fdbcfe1eeee..39e8869ea94d074a113aff1a45e7de63c54c4a9d 100644 (file)
@@ -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.