emacs-diffs
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

[Emacs-diffs] emacs-26 74d7bb9: Fix errors in flyspell-post-command-hook


From: Eli Zaretskii
Subject: [Emacs-diffs] emacs-26 74d7bb9: Fix errors in flyspell-post-command-hook
Date: Tue, 19 Sep 2017 12:36:38 -0400 (EDT)

branch: emacs-26
commit 74d7bb94988055a49ac8f1cbc5af43ac31255581
Author: Eli Zaretskii <address@hidden>
Commit: Eli Zaretskii <address@hidden>

    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)
---
 lisp/textmodes/ispell.el | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/lisp/textmodes/ispell.el b/lisp/textmodes/ispell.el
index 0c0a51e..6a16962 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))



reply via email to

[Prev in Thread] Current Thread [Next in Thread]