From 5ededac618d56940a6656443ac1d859c30821808 Mon Sep 17 00:00:00 2001
From: Paul Eggert <eggert@cs.ucla.edu>
Date: Fri, 18 Apr 2003 05:11:25 +0000
Subject: [PATCH] Fix regression reported by Werner Lemberg in
 <http://mail.gnu.org/archive/html/bug-bison/2003-04/msg00026.html>.

---
 ChangeLog | 14 ++++++++++++++
 1 file changed, 14 insertions(+)

diff --git a/ChangeLog b/ChangeLog
index 268bb8a..e5bb37a 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,17 @@
+2003-04-17  Paul Eggert  <eggert@twinsun.com>
+
+	* src/conflicts.c (set_conflicts): Resolve all conflicts, not just
+	the first one.  This change is from Paul Hilfinger, and it fixes
+	regression reported by Werner Lemberg in
+	<http://mail.gnu.org/archive/html/bug-bison/2003-04/msg00026.html>.
+
+	(resolve_sr_conflict): Don't invoke state_errs_set
+	unless one or more tokens have been explicitly made errors.
+	Otherwise, the above change causes Bison to abort.
+
+	* tests/existing.at (GNU pic Grammar): New test case, taken from
+	Lemberg's email.
+
 2003-03-31  Akim Demaille  <akim@epita.fr>
 
 	* doc/Makefile.am (AM_MAKEINFOFLAGS): Don't split the info file.
-- 
2.7.4