* lisp/emacs-lisp/smie.el (smie-bnf->prec2): Fix last change.

(Bug#8934)

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 9c67ce8e0e5f7459f6499439faf2aa7ac32a426d..d86248454be583168faee765d8a14a4e7f7f8c2f 100644 (file)
--- 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 0206abb9f53a596e879d6bea2ce1273a58844fba..cad7c8419b2ef633ef7fba40b153d092e969f7cb 100644 (file)
--- 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)