2007-02-20 [wwp] 2.7.2cvs54

	* src/matcher_parser_lex.l
	* src/quote_fmt_lex.l
		Use proper flex options instead of direct use of #define,
		make the flex-generated C lighter.

diff --git a/ChangeLog b/ChangeLog
index 99cc0c61f9fba03d9be2c0ed94412b63bc18b9f0..0ab31063a560ad78ccb40eea043c47eede8d6284 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2007-02-20 [wwp]       2.7.2cvs54
+
+       * src/matcher_parser_lex.l
+       * src/quote_fmt_lex.l
+               Use proper flex options instead of direct use of #define,
+               make the flex-generated C lighter.
+
 2007-02-20 [colin]     2.7.2cvs53
 
        * src/summaryview.c

diff --git a/PATCHSETS b/PATCHSETS
index df7d277f9af1274a69b5ec71666383da480d4b95..a9bc9cd047abe54c8744b67df092ba8094c4f75b 100644 (file)
--- a/PATCHSETS
+++ b/PATCHSETS
@@ -2371,3 +2371,4 @@
 ( cvs diff -u -r 1.25.2.15 -r 1.25.2.16 tools/Makefile.am;  cvs diff -u -r 1.30.2.15 -r 1.30.2.16 tools/README;  diff -u /dev/null tools/thunderbird-filters-convertor.pl;  ) > 2.7.2cvs51.patchset
 ( cvs diff -u -r 1.207.2.148 -r 1.207.2.149 src/folderview.c;  ) > 2.7.2cvs52.patchset
 ( cvs diff -u -r 1.395.2.283 -r 1.395.2.284 src/summaryview.c;  ) > 2.7.2cvs53.patchset
+( cvs diff -u -r 1.16.2.10 -r 1.16.2.11 src/matcher_parser_lex.l;  cvs diff -u -r 1.8.2.7 -r 1.8.2.8 src/quote_fmt_lex.l;  ) > 2.7.2cvs54.patchset

diff --git a/configure.ac b/configure.ac
index 79440f70611b3c5ae807e6d82f055e63c0c9e54a..7ad4c3acb9f22d3cfb3e906d4abb7a701cc99c86 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -11,7 +11,7 @@ MINOR_VERSION=7
 MICRO_VERSION=2
 INTERFACE_AGE=0
 BINARY_AGE=0
-EXTRA_VERSION=53
+EXTRA_VERSION=54
 EXTRA_RELEASE=
 EXTRA_GTK2_VERSION=
 

diff --git a/src/matcher_parser_lex.l b/src/matcher_parser_lex.l
index 0654b7a3ad9bcdce7ce879047f0dfe7f32994319..c12c1ca340eda69d73ffa833f4e90b1d2f813c06 100644 (file)
--- a/src/matcher_parser_lex.l
+++ b/src/matcher_parser_lex.l
@@ -1,3 +1,5 @@
+%option nounput never-interactive
+
 %{
 /*
  * Sylpheed -- a GTK+ based, lightweight, and fast e-mail client
@@ -28,7 +30,6 @@
 #include "matcher_parser_parse.h"
 #endif
 #define MAX_STR_CONST 512
-#define YY_NO_UNPUT 1
 
 static char string_buf[MAX_STR_CONST];
 static char *string_buf_ptr;

diff --git a/src/quote_fmt_lex.l b/src/quote_fmt_lex.l
index 569fe60b24a9e018b032b2d3bd7f3443993756c0..55c33d4000b5eca841695b3be948b00915fedb8a 100644 (file)
--- a/src/quote_fmt_lex.l
+++ b/src/quote_fmt_lex.l
@@ -1,3 +1,5 @@
+%option nounput never-interactive
+
 %{
 /*
  * Sylpheed -- a GTK+ based, lightweight, and fast e-mail client
@@ -21,7 +23,6 @@
 #include "quote_fmt_lex.h"
 #include "quote_fmt_parse.h"
 
-#define YY_NO_UNPUT 1
 %}
 
 %option prefix="quote_fmt"