From: Tristan Chabredier Date: Tue, 13 Jun 2006 10:49:55 +0000 (+0000) Subject: 2006-06-13 [wwp] 2.3.0cvs8 X-Git-Tag: rel_2_4_0~121 X-Git-Url: http://git.claws-mail.org/?p=claws.git;a=commitdiff_plain;h=4e77b80a385a995df2fef3d728901877d9ca1dd7 2006-06-13 [wwp] 2.3.0cvs8 * src/quote_fmt_lex.l fix wrong tokens returned in quote_fmt lexer, query not(). --- diff --git a/ChangeLog b/ChangeLog index e0b45ae33..6f51378f6 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ +2006-06-13 [wwp] 2.3.0cvs8 + + * src/quote_fmt_lex.l + fix wrong tokens returned in quote_fmt lexer, query not(). + 2006-06-13 [wwp] 2.3.0cvs7 * src/folder.c diff --git a/PATCHSETS b/PATCHSETS index 6135800ee..1813cc06d 100644 --- a/PATCHSETS +++ b/PATCHSETS @@ -1582,3 +1582,4 @@ ( cvs diff -u -r 1.382.2.276 -r 1.382.2.277 src/compose.c; cvs diff -u -r 1.50.2.25 -r 1.50.2.26 src/compose.h; cvs diff -u -r 1.213.2.97 -r 1.213.2.98 src/folder.c; cvs diff -u -r 1.87.2.28 -r 1.87.2.29 src/folder.h; cvs diff -u -r 1.179.2.119 -r 1.179.2.120 src/imap.c; cvs diff -u -r 1.149.2.51 -r 1.149.2.52 src/inc.c; cvs diff -u -r 1.115.2.89 -r 1.115.2.90 src/main.c; cvs diff -u -r 1.94.2.85 -r 1.94.2.86 src/messageview.c; cvs diff -u -r 1.79.2.34 -r 1.79.2.35 src/mh.c; cvs diff -u -r 1.52.2.20 -r 1.52.2.21 src/prefs_folder_item.c; cvs diff -u -r 1.47.2.30 -r 1.47.2.31 src/procheader.c; cvs diff -u -r 1.49.2.76 -r 1.49.2.77 src/procmime.c; cvs diff -u -r 1.150.2.67 -r 1.150.2.68 src/procmsg.c; cvs diff -u -r 1.60.2.28 -r 1.60.2.29 src/procmsg.h; cvs diff -u -r 1.17.2.30 -r 1.17.2.31 src/send_message.c; cvs diff -u -r 1.395.2.219 -r 1.395.2.220 src/summaryview.c; cvs diff -u -r 1.43.2.46 -r 1.43.2.47 src/toolbar.c; ) > 2.3.0cvs5.patchset ( cvs diff -u -r 1.207.2.102 -r 1.207.2.103 src/folderview.c; ) > 2.3.0cvs6.patchset ( cvs diff -u -r 1.213.2.98 -r 1.213.2.99 src/folder.c; cvs diff -u -r 1.52.2.21 -r 1.52.2.22 src/prefs_folder_item.c; ) > 2.3.0cvs7.patchset +( cvs diff -u -r 1.8.2.3 -r 1.8.2.4 src/quote_fmt_lex.l; ) > 2.3.0cvs8.patchset diff --git a/configure.ac b/configure.ac index e512a0058..8ca6313af 100644 --- a/configure.ac +++ b/configure.ac @@ -11,7 +11,7 @@ MINOR_VERSION=3 MICRO_VERSION=0 INTERFACE_AGE=0 BINARY_AGE=0 -EXTRA_VERSION=7 +EXTRA_VERSION=8 EXTRA_RELEASE= EXTRA_GTK2_VERSION= diff --git a/src/quote_fmt_lex.l b/src/quote_fmt_lex.l index 844fefb08..320ac105e 100644 --- a/src/quote_fmt_lex.l +++ b/src/quote_fmt_lex.l @@ -89,13 +89,13 @@ int quote_fmt_firsttime = 1; "|p" /* insert program output */ return INSERT_PROGRAMOUTPUT; "!d" /* query date */ return QUERY_NOT_DATE; "!f" /* query from */ return QUERY_NOT_FROM; -"!N"|"!F"|"!L"|"!I" /* query from name */ return QUERY_NOT_FULLNAME; -"!s" /* query subject */ return QUERY_NOT_SUBJECT; -"!t" /* query to */ return QUERY_NOT_TO; -"!c" /* query cc */ return QUERY_NOT_CC; -"!n" /* query newsgroups */ return QUERY_NOT_NEWSGROUPS; -"!i" /* query message-id */ return QUERY_MESSAGEID; -"!r" /* query references */ return QUERY_REFERENCES; +"!N"|"!F"|"!L"|"!I" /* query not(from name) */ return QUERY_NOT_FULLNAME; +"!s" /* query not(subject) */ return QUERY_NOT_SUBJECT; +"!t" /* query not(to) */ return QUERY_NOT_TO; +"!c" /* query not(cc) */ return QUERY_NOT_CC; +"!n" /* query not(newsgroups) */ return QUERY_NOT_NEWSGROUPS; +"!i" /* query not(message-id) */ return QUERY_NOT_MESSAGEID; +"!r" /* query not(references) */ return QUERY_NOT_REFERENCES; "{" return OPARENT; "}" { BEGIN S_NORMAL; return CPARENT; } "{" return OPARENT;