summaryrefslogtreecommitdiff
path: root/lisp/textmodes
diff options
context:
space:
mode:
authorReuben Thomas <rrt@sc3d.org>2018-03-16 10:50:21 +0000
committerEli Zaretskii <eliz@gnu.org>2018-06-10 19:53:39 +0300
commit4c3fae3cf26d2112f0744f89da93b2440cd45d56 (patch)
tree6caa1c40a74114e749435fb474e5180ebe69fa3e /lisp/textmodes
parent3434edc731e4602891a9cf6418ec4e5ff2f60830 (diff)
downloademacs-4c3fae3cf26d2112f0744f89da93b2440cd45d56.tar.gz
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)
Diffstat (limited to 'lisp/textmodes')
-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.")
(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.