From: Stefan Monnier <monnier@iro.umontreal.ca>
Date: Thu, 21 Nov 2019 23:24:37 +0000 (-0500)
Subject: * lisp/emacs-lisp/smie.el (smie-next-sexp): Fix bug#38255
X-Git-Tag: emacs-27.0.90~557
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=c5de861af1da697b4481133e4f5f966e6a3fc859;p=emacs.git

* lisp/emacs-lisp/smie.el (smie-next-sexp): Fix bug#38255

Handle the case where the token is not in `smie-grammar`, either because
the caller is making an error, or because it's a paren-like token that's
not handled in the grammar but directly via the syntax tables.
---

diff --git a/lisp/emacs-lisp/smie.el b/lisp/emacs-lisp/smie.el
index f2163b243ee..2c2898ae718 100644
--- a/lisp/emacs-lisp/smie.el
+++ b/lisp/emacs-lisp/smie.el
@@ -702,7 +702,11 @@ Possible return values:
   (catch 'return
     (let ((levels
            (if (stringp halfsexp)
-               (prog1 (list (cdr (assoc halfsexp smie-grammar)))
+               (prog1 (list (or (cdr (assoc halfsexp smie-grammar))
+                                (when (string-match "\\`\\s(\\|\\s)\\(\\)\\'"
+                                                    halfsexp)
+                                  (if (match-end 1) '(0 nil) '(nil 0)))
+                                (error "Unknown token: %S" halfsexp)))
                  (setq halfsexp nil)))))
       (while
           (let* ((pos (point))