From 1e3b7b6e8126c304fad4ae3981330ba2ef475a37 Mon Sep 17 00:00:00 2001
From: =?utf8?q?Ho=C3=A0=20Vi=C3=AAt=20Dinh?= <dinh.viet.hoa@free.fr>
Date: Mon, 9 Jul 2001 16:43:58 +0000
Subject: [PATCH] clean the grammar

---
 AUTHORS                    | 2 +-
 ChangeLog.claws            | 8 ++++++++
 src/matcher_parser_parse.y | 9 ---------
 3 files changed, 9 insertions(+), 10 deletions(-)

diff --git a/AUTHORS b/AUTHORS
index 2ab63e1e5..945f07a5a 100644
--- a/AUTHORS
+++ b/AUTHORS
@@ -5,7 +5,7 @@ main-branch (http://sylpheed.good-day.net)
 
 claws-branch (http://sylpheed-claws.sourceforge.net)
 
-	Hoa viet Dinh		<dinh@enseirb.fr>
+	Hoa viet Dinh		<dinh.viet.hoa@free.fr>
 	Match Grun		<match@dimensional.com>
         Christoph Hohmann       <reboot@gmx.ch>
 	Alfons Hoogervorst	<alfons@proteus.demon.nl>
diff --git a/ChangeLog.claws b/ChangeLog.claws
index d78010890..2f86a5c64 100644
--- a/ChangeLog.claws
+++ b/ChangeLog.claws
@@ -1,3 +1,11 @@
+2001-07-08 [hoa]
+
+	* AUTHORS
+		changed my email address
+
+	* src/matcher_parser_parse.y
+		clean the parser to remove conflicts
+
 2001-07-09 [alfons]
 
 	* AUTHORS
diff --git a/src/matcher_parser_parse.y b/src/matcher_parser_parse.y
index c8c4db585..3dd4f9f22 100644
--- a/src/matcher_parser_parse.y
+++ b/src/matcher_parser_parse.y
@@ -628,15 +628,6 @@ MATCHER_ALL
 	expr = $3;
 	prop = matcherprop_new(criteria, NULL, match_type, expr, 0);
 }
-| MATCHER_NOT_MESSAGE match_type MATCHER_STRING
-{
-	gint criteria = 0;
-	gchar * expr = NULL;
-
-	criteria = MATCHCRITERIA_NOT_MESSAGE;
-	expr = $3;
-	prop = matcherprop_new(criteria, NULL, match_type, expr, 0);
-}
 | MATCHER_EXECUTE MATCHER_STRING
 {
 	gint criteria = 0;
-- 
2.25.1