summaryrefslogtreecommitdiff
path: root/lisp/textmodes/ispell.el
diff options
context:
space:
mode:
authorEli Zaretskii <eliz@gnu.org>2017-09-19 19:32:09 +0300
committerEli Zaretskii <eliz@gnu.org>2017-09-19 19:32:09 +0300
commit74d7bb94988055a49ac8f1cbc5af43ac31255581 (patch)
treeac47b78ec47699505809a72bd75b2dee80ac3c65 /lisp/textmodes/ispell.el
parent40fdbb01d0017e9e164a24aeb760056778975e65 (diff)
downloademacs-74d7bb94988055a49ac8f1cbc5af43ac31255581.tar.gz
Fix errors in flyspell-post-command-hook
* lisp/textmodes/ispell.el (ispell-get-decoded-string): Handle the case of a nil Nth element of the language dictionary slot. This avoids errors in 'flyspell-post-command-hook' when switching dictionaries with some spell-checkers. (Bug#28501)
Diffstat (limited to 'lisp/textmodes/ispell.el')
-rw-r--r--lisp/textmodes/ispell.el6
1 files changed, 4 insertions, 2 deletions
diff --git a/lisp/textmodes/ispell.el b/lisp/textmodes/ispell.el
index 0c0a51e7df0..6a169622f52 100644
--- a/lisp/textmodes/ispell.el
+++ b/lisp/textmodes/ispell.el
@@ -1492,8 +1492,10 @@ This is passed to the Ispell process using the `-p' switch.")
(assoc ispell-current-dictionary ispell-local-dictionary-alist)
(assoc ispell-current-dictionary ispell-dictionary-alist)
(error "No data for dictionary \"%s\" in `ispell-local-dictionary-alist' or `ispell-dictionary-alist'"
- ispell-current-dictionary))))
- (decode-coding-string (nth n slot) (ispell-get-coding-system) t)))
+ ispell-current-dictionary)))
+ (str (nth n slot)))
+ (if (stringp str)
+ (decode-coding-string str (ispell-get-coding-system) t))))
(defun ispell-get-casechars ()
(ispell-get-decoded-string 1))