diff options
| author | Yuuki Harano <masm+github@masm11.me> | 2021-11-11 00:39:53 +0900 |
|---|---|---|
| committer | Yuuki Harano <masm+github@masm11.me> | 2021-11-11 00:39:53 +0900 |
| commit | 4dd1f56f29fc598a8339a345c2f8945250600602 (patch) | |
| tree | af341efedffe027e533b1bcc0dbf270532e48285 /lisp/emacs-lisp/smie.el | |
| parent | 4c49ec7f865bdad1629d2f125f71f4e506b258f2 (diff) | |
| parent | 810fa21d26453f898de9747ece7205dfe6de9d08 (diff) | |
| download | emacs-4dd1f56f29fc598a8339a345c2f8945250600602.tar.gz emacs-4dd1f56f29fc598a8339a345c2f8945250600602.tar.bz2 emacs-4dd1f56f29fc598a8339a345c2f8945250600602.zip | |
Merge branch 'master' of git.savannah.gnu.org:/srv/git/emacs into feature/pgtk
Diffstat (limited to 'lisp/emacs-lisp/smie.el')
| -rw-r--r-- | lisp/emacs-lisp/smie.el | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/lisp/emacs-lisp/smie.el b/lisp/emacs-lisp/smie.el index ab3cb3c5ace..8e14faea3a4 100644 --- a/lisp/emacs-lisp/smie.el +++ b/lisp/emacs-lisp/smie.el @@ -1302,7 +1302,7 @@ Only meaningful when called from within `smie-rules-function'." (let ((tok (funcall smie-forward-token-function))) (unless tok (with-demoted-errors - (error "smie-rule-separator: can't skip token %s" + (error "smie-rule-separator: Can't skip token %s" smie--token)))) (skip-chars-forward " ") (unless (eolp) (point))))) @@ -1407,7 +1407,9 @@ BASE-POS is the position relative to which offsets should be applied." (funcall smie-rules-function method token))) (defun smie-indent-forward-token () - "Skip token forward and return it, along with its levels." + "Skip token forward and return it, along with its levels. +Point should be between tokens when calling this function (i.e., +not in the middle of a string/comment)." (let ((tok (funcall smie-forward-token-function))) (cond ((< 0 (length tok)) (assoc tok smie-grammar)) |