Skip to content

GitLab

Commit 06bc5e6e authored by Stefan Monnier's avatar Stefan Monnier
Browse files

*** empty log message ***

parent 0ae03b6a
Hide whitespace changes
Inline Side-by-side
Showing with 9 additions and 2 deletions
lisp/ChangeLog
View file @ 06bc5e6e
2012-05-13 Johan Bockgård <bojohan@gnu.org>
* emacs-lisp/smie.el (smie-next-sexp): Use accessor `op-forw' rather
than hard-coding `car', to fix misbehavior when moving forward.
2012-05-13 Chong Yidong <cyd@gnu.org>
* emacs-lisp/tabulated-list.el (tabulated-list-format)
......
lisp/emacs-lisp/smie.el
View file @ 06bc5e6e
......@@ -728,7 +728,8 @@ Possible return values:
(if (and halfsexp (numberp (funcall op-forw toklevels)))
(push toklevels levels)
(throw 'return
(prog1 (list (or (car toklevels) t) (point) token)
(prog1 (list (or (funcall op-forw toklevels) t)
(point) token)
(goto-char pos)))))
(t
(let ((lastlevels levels))
......@@ -773,7 +774,8 @@ Possible return values:
((and lastlevels
(smie--associative-p (car lastlevels)))
(throw 'return
(prog1 (list (or (car toklevels) t) (point) token)
(prog1 (list (or (funcall op-forw toklevels) t)
(point) token)
(goto-char pos))))
;; - it's an associative operator within a larger construct
;; (e.g. an "elsif"), so we should just ignore it and keep
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment