mirrors/emacs
1
Fork 0
mirror of git://git.sv.gnu.org/emacs.git synced 2025-12-15 10:30:25 -08:00
Code Issues Projects Releases Wiki Activity

*** empty log message ***

Browse source
This commit is contained in:
Stefan Monnier 2012-05-13 12:04:37 -04:00
parent 0ae03b6aae
commit 06bc5e6ea6
2 changed files with 9 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

5
lisp/ChangeLog
View file

@ -1,3 +1,8 @@
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)

6
lisp/emacs-lisp/smie.el
View file

@ -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