diff options
| author | Stefan Monnier <monnier@iro.umontreal.ca> | 2019-11-21 18:24:37 -0500 |
|---|---|---|
| committer | Stefan Monnier <monnier@iro.umontreal.ca> | 2019-11-21 18:25:00 -0500 |
| commit | c5de861af1da697b4481133e4f5f966e6a3fc859 (patch) | |
| tree | 3129e7b7850b40dedc468af58b9d6ea49dabf540 /lisp/emacs-lisp | |
| parent | 04208780262faaee772c96567069ceb9184c864f (diff) | |
| download | emacs-c5de861af1da697b4481133e4f5f966e6a3fc859.tar.gz | |
* 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.
Diffstat (limited to 'lisp/emacs-lisp')
| -rw-r--r-- | lisp/emacs-lisp/smie.el | 6 |
1 files changed, 5 insertions, 1 deletions
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)) |