[Emacs-diffs] /srv/bzr/emacs/trunk r108218: *** empty log message ***

[Stefan Monnier]

------------------------------------------------------------
revno: 108218
committer: Stefan Monnier <address@hidden>
branch nick: trunk
timestamp: Sun 2012-05-13 12:04:37 -0400
message:
  *** empty log message ***
modified:
  lisp/ChangeLog
  lisp/emacs-lisp/smie.el

=== modified file 'lisp/ChangeLog'
--- a/lisp/ChangeLog    2012-05-13 14:23:45 +0000
+++ b/lisp/ChangeLog    2012-05-13 16:04:37 +0000
@@ -1,3 +1,8 @@
+2012-05-13  Johan Bockgård  <address@hidden>
+
+       * 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  <address@hidden>
 
        * emacs-lisp/tabulated-list.el (tabulated-list-format)

=== modified file 'lisp/emacs-lisp/smie.el'
--- a/lisp/emacs-lisp/smie.el   2012-04-19 17:20:26 +0000
+++ b/lisp/emacs-lisp/smie.el   2012-05-13 16:04:37 +0000
@@ -728,7 +728,8 @@
                 (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 @@
                    ((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