[Emacs-diffs] /srv/bzr/emacs/trunk r104729: * lisp/emacs-lisp/smie.el (smie-bnf->prec2): Fix last change.

[Andreas Schwab]

------------------------------------------------------------
revno: 104729
committer: Andreas Schwab <address@hidden>
branch nick: emacs
timestamp: Sun 2011-06-26 10:43:52 +0200
message:
  * lisp/emacs-lisp/smie.el (smie-bnf->prec2): Fix last change.
  (Bug#8934)
modified:
  lisp/ChangeLog
  lisp/emacs-lisp/smie.el

=== modified file 'lisp/ChangeLog'
--- a/lisp/ChangeLog    2011-06-26 08:13:07 +0000
+++ b/lisp/ChangeLog    2011-06-26 08:43:52 +0000
@@ -1,3 +1,8 @@
+2011-06-26  Andreas Schwab  <address@hidden>
+
+       * emacs-lisp/smie.el (smie-bnf->prec2): Fix last change.
+       (Bug#8934)
+
 2011-06-26  Lars Magne Ingebrigtsen  <address@hidden>
 
        * net/network-stream.el (network-stream-open-starttls): Use

=== modified file 'lisp/emacs-lisp/smie.el'
--- a/lisp/emacs-lisp/smie.el   2011-06-23 16:55:59 +0000
+++ b/lisp/emacs-lisp/smie.el   2011-06-26 08:43:52 +0000
@@ -238,9 +238,9 @@
                 (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)