*** empty log message ***

2 files changed, 9 insertions, 2 deletions

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 557e8eb2e48..03b9a3ba15b 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -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)
diff --git a/lisp/emacs-lisp/smie.el b/lisp/emacs-lisp/smie.el
index cafa1942a09..ae3e060034f 100644
--- a/lisp/emacs-lisp/smie.el
+++ b/lisp/emacs-lisp/smie.el
@@ -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