From a1ef911f31b81a47482dca4ea01f2c90442c0724 Mon Sep 17 00:00:00 2001 From: Stefan Monnier Date: Wed, 16 Mar 2016 22:55:56 -0400 Subject: [PATCH] * lisp/emacs-lisp/smie.el (smie-indent-keyword): Don't burp in strings (bug#22960). --- lisp/emacs-lisp/smie.el | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/lisp/emacs-lisp/smie.el b/lisp/emacs-lisp/smie.el index 495ba7cb859..1d8f0cb8f5d 100644 --- a/lisp/emacs-lisp/smie.el +++ b/lisp/emacs-lisp/smie.el @@ -1493,7 +1493,10 @@ should not be computed on the basis of the following token." (let ((endpos (point))) (goto-char pos) (forward-line 1) - (and (equal res (smie-indent-forward-token)) + ;; As seen in bug#22960, pos may be inside + ;; a string, and forward-token may then stumble. + (and (ignore-errors + (equal res (smie-indent-forward-token))) (eq (point) endpos))))) nil (goto-char pos) -- 2.11.4.GIT