diff options
Diffstat (limited to 'lisp')
| -rw-r--r-- | lisp/ChangeLog | 5 | ||||
| -rw-r--r-- | lisp/emacs-lisp/smie.el | 4 |
2 files changed, 7 insertions, 2 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog index 9c67ce8e0e5..d86248454be 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog @@ -1,3 +1,8 @@ +2011-06-26 Andreas Schwab <schwab@linux-m68k.org> + + * emacs-lisp/smie.el (smie-bnf->prec2): Fix last change. + (Bug#8934) + 2011-06-26 Lars Magne Ingebrigtsen <larsi@gnus.org> * net/network-stream.el (network-stream-open-starttls): Use diff --git a/lisp/emacs-lisp/smie.el b/lisp/emacs-lisp/smie.el index 0206abb9f53..cad7c8419b2 100644 --- a/lisp/emacs-lisp/smie.el +++ b/lisp/emacs-lisp/smie.el @@ -238,9 +238,9 @@ one of those elements share the same precedence level and associativity." (pushnew (car shr) last-ops) (pushnew (car shr) last-nts) (when (consp (cdr shr)) - (when (member (cadr rhs) nts) + (when (member (cadr shr) nts) (error "Adjacent non-terminals: %s %s" - (cadr rhs) (car rhs))) + (cadr shr) (car shr))) (pushnew (cadr shr) last-ops))))) (push (cons nt first-ops) first-ops-table) (push (cons nt last-ops) last-ops-table) |