diff options
| author | Stefan Monnier <monnier@iro.umontreal.ca> | 2012-05-13 12:04:37 -0400 |
|---|---|---|
| committer | Stefan Monnier <monnier@iro.umontreal.ca> | 2012-05-13 12:04:37 -0400 |
| commit | 06bc5e6ea6d36a1166c95b81c29bc3e748d8f652 (patch) | |
| tree | 570af101e5fa6d4aa0cba8e4a81072a28b1062f6 /lisp/emacs-lisp/smie.el | |
| parent | 0ae03b6aae534c1a47f7246e791138b41203b036 (diff) | |
| download | emacs-06bc5e6ea6d36a1166c95b81c29bc3e748d8f652.tar.gz | |
*** empty log message ***
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 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 |