aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAndreas Schwab2011-06-26 10:43:52 +0200
committerAndreas Schwab2011-06-26 10:43:52 +0200
commitbc3122541bc99fb85fb9fc531d53e284ee1c392f (patch)
tree7397ca498c505e061aee0603381677ffc7e0a429
parent2db18f3ffa5ade74429c6533e4bb22a3ee93cb6d (diff)
downloademacs-bc3122541bc99fb85fb9fc531d53e284ee1c392f.tar.gz
emacs-bc3122541bc99fb85fb9fc531d53e284ee1c392f.zip
* lisp/emacs-lisp/smie.el (smie-bnf->prec2): Fix last change.
(Bug#8934)
-rw-r--r--lisp/ChangeLog5
-rw-r--r--lisp/emacs-lisp/smie.el4
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 @@
12011-06-26 Andreas Schwab <schwab@linux-m68k.org>
2
3 * emacs-lisp/smie.el (smie-bnf->prec2): Fix last change.
4 (Bug#8934)
5
12011-06-26 Lars Magne Ingebrigtsen <larsi@gnus.org> 62011-06-26 Lars Magne Ingebrigtsen <larsi@gnus.org>
2 7
3 * net/network-stream.el (network-stream-open-starttls): Use 8 * 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."
238 (pushnew (car shr) last-ops) 238 (pushnew (car shr) last-ops)
239 (pushnew (car shr) last-nts) 239 (pushnew (car shr) last-nts)
240 (when (consp (cdr shr)) 240 (when (consp (cdr shr))
241 (when (member (cadr rhs) nts) 241 (when (member (cadr shr) nts)
242 (error "Adjacent non-terminals: %s %s" 242 (error "Adjacent non-terminals: %s %s"
243 (cadr rhs) (car rhs))) 243 (cadr shr) (car shr)))
244 (pushnew (cadr shr) last-ops))))) 244 (pushnew (cadr shr) last-ops)))))
245 (push (cons nt first-ops) first-ops-table) 245 (push (cons nt first-ops) first-ops-table)
246 (push (cons nt last-ops) last-ops-table) 246 (push (cons nt last-ops) last-ops-table)