talons

commit 0d8d539a35e8d4c0fa2feba29e78f475b2cddd7f
parent 66e31c97eb339c30989fa494248a110549e9e685
Author: Colin Leroy <colin@colino.net>
Date:   Mon, 29 Jun 2009 20:08:54 +0000

2009-06-29 [colin]	3.7.1cvs82

	* src/matcher_parser_lex.l
		Fix bug 1878, 'Processing rules for folders with brackets aren't saved'

Diffstat:
M
ChangeLog
 | 
5
+++++
M
PATCHSETS
 | 
1
+
M
configure.ac
 | 
2
+-
M
src/matcher_parser_lex.l
 | 
4
++--

4 files changed, 9 insertions(+), 3 deletions(-)
diff --git a/ChangeLog b/ChangeLog
@@ -1,3 +1,8 @@
+2009-06-29 [colin]	3.7.1cvs82
+
+	* src/matcher_parser_lex.l
+		Fix bug 1878, 'Processing rules for folders with brackets aren't saved'
+
 2009-06-29 [colin]	3.7.1cvs81
 
 	* src/addressbook.c
diff --git a/PATCHSETS b/PATCHSETS
@@ -3821,3 +3821,4 @@
 ( cvs diff -u -r 1.395.2.412 -r 1.395.2.413 src/summaryview.c;  ) > 3.7.1cvs79.patchset
 ( cvs diff -u -r 1.1.2.22 -r 1.1.2.23 src/ldapupdate.c;  cvs diff -u -r 1.12.2.20 -r 1.12.2.21 src/ldif.c;  ) > 3.7.1cvs80.patchset
 ( cvs diff -u -r 1.60.2.133 -r 1.60.2.134 src/addressbook.c;  cvs diff -u -r 1.11.2.22 -r 1.11.2.23 src/editgroup.c;  cvs diff -u -r 1.1.2.12 -r 1.1.2.13 src/gtk/gtkcmctree.c;  cvs diff -u -r 1.1.4.56 -r 1.1.4.57 src/gtk/gtksctree.c;  ) > 3.7.1cvs81.patchset
+( cvs diff -u -r 1.16.2.13 -r 1.16.2.14 src/matcher_parser_lex.l;  ) > 3.7.1cvs82.patchset
diff --git a/configure.ac b/configure.ac
@@ -12,7 +12,7 @@ MINOR_VERSION=7
 MICRO_VERSION=1
 INTERFACE_AGE=0
 BINARY_AGE=0
-EXTRA_VERSION=81
+EXTRA_VERSION=82
 EXTRA_RELEASE=
 EXTRA_GTK2_VERSION=
 
diff --git a/src/matcher_parser_lex.l b/src/matcher_parser_lex.l
@@ -31,7 +31,7 @@
 #include "matcher_parser_parse.h"
 #endif
 
-#define MAX_STR_CONST 512
+#define MAX_STR_CONST 8192
 
 static char string_buf[MAX_STR_CONST];
 static char *string_buf_ptr;
@@ -104,7 +104,7 @@ void matcher_parser_init(void)
 <string>.	{
 		add_char(yytext[0]);
 		}
-\[[^\[\]]*\]	{
+^\[.*\]$	{
                 /* for section name in configuration file */
 		BEGIN(0);
 		yylval.str = yytext + 1;