aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorReuben Thomas2018-03-16 10:50:21 +0000
committerEli Zaretskii2018-06-10 19:53:39 +0300
commit4c3fae3cf26d2112f0744f89da93b2440cd45d56 (patch)
tree6caa1c40a74114e749435fb474e5180ebe69fa3e
parent3434edc731e4602891a9cf6418ec4e5ff2f60830 (diff)
downloademacs-4c3fae3cf26d2112f0744f89da93b2440cd45d56.tar.gz
emacs-4c3fae3cf26d2112f0744f89da93b2440cd45d56.zip
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)
-rw-r--r--lisp/textmodes/ispell.el5
1 files changed, 3 insertions, 2 deletions
diff --git a/lisp/textmodes/ispell.el b/lisp/textmodes/ispell.el
index 2b88057dc4f..39e8869ea94 100644
--- a/lisp/textmodes/ispell.el
+++ b/lisp/textmodes/ispell.el
@@ -1202,8 +1202,9 @@ Internal use.")
1202 (with-output-to-string 1202 (with-output-to-string
1203 (with-current-buffer 1203 (with-current-buffer
1204 standard-output 1204 standard-output
1205 (apply 'ispell-call-process 1205 (apply 'ispell-call-process
1206 (concat ispell-program-name "-lsmod") nil t nil args)))) 1206 (replace-regexp-in-string "enchant\\(-[0-9]\\)?$" "enchant-lsmod\\1"
1207 ispell-program-name) nil t nil args))))
1207 1208
1208(defun ispell--get-extra-word-characters (&optional lang) 1209(defun ispell--get-extra-word-characters (&optional lang)
1209 "Get the extra word characters for LANG as a character class. 1210 "Get the extra word characters for LANG as a character class.