From: Tristan Chabredier Date: Mon, 23 Jul 2007 15:38:53 +0000 (+0000) Subject: 2007-07-23 [wwp] 2.10.0cvs57 X-Git-Tag: rel_3_0_0~139 X-Git-Url: http://git.claws-mail.org/?p=claws.git;a=commitdiff_plain;h=fd1e56fa26aac3744e2be7e0ffb87c59ffb736ff;ds=sidebyside 2007-07-23 [wwp] 2.10.0cvs57 * src/quote_fmt_lex.l Revert accidentaly committed lines (account_sig) in 2.10.0cvs56. --- diff --git a/ChangeLog b/ChangeLog index 85f28b257..6e841cf7e 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,9 @@ +2007-07-23 [wwp] 2.10.0cvs57 + + * src/quote_fmt_lex.l + Revert accidentaly committed lines (account_sig) in + 2.10.0cvs56. + 2007-07-23 [wwp] 2.10.0cvs56 * src/quote_fmt_lex.l diff --git a/PATCHSETS b/PATCHSETS index 0ac4d9e84..9f0f2d76c 100644 --- a/PATCHSETS +++ b/PATCHSETS @@ -2710,3 +2710,4 @@ ( cvs diff -u -r 1.5.2.18 -r 1.5.2.19 src/statusbar.c; ) > 2.10.0cvs54.patchset ( cvs diff -u -r 1.27.2.37 -r 1.27.2.38 src/addr_compl.c; ) > 2.10.0cvs55.patchset ( cvs diff -u -r 1.8.2.13 -r 1.8.2.14 src/quote_fmt_lex.l; ) > 2.10.0cvs56.patchset +( cvs diff -u -r 1.8.2.14 -r 1.8.2.15 src/quote_fmt_lex.l; ) > 2.10.0cvs57.patchset diff --git a/configure.ac b/configure.ac index 6f4414f54..46120eeb0 100644 --- a/configure.ac +++ b/configure.ac @@ -11,7 +11,7 @@ MINOR_VERSION=10 MICRO_VERSION=0 INTERFACE_AGE=0 BINARY_AGE=0 -EXTRA_VERSION=56 +EXTRA_VERSION=57 EXTRA_RELEASE= EXTRA_GTK2_VERSION= diff --git a/src/quote_fmt_lex.l b/src/quote_fmt_lex.l index 9f1461edb..54dd876e1 100644 --- a/src/quote_fmt_lex.l +++ b/src/quote_fmt_lex.l @@ -95,7 +95,6 @@ int line = -1; ("%am"|"%account_email") /* mail address in compose account */ return SHOW_ACCOUNT_MAIL_ADDRESS; ("%an"|"%account_name") /* compose account name itself */ return SHOW_ACCOUNT_NAME; ("%ao"|"%account_org") /* organization in compose account */ return SHOW_ACCOUNT_ORGANIZATION; -("%as"|"%account_sig") /* signature in compose account */ return SHOW_ACCOUNT_SIG; ("%aT"|"%account_dict") /* main dict (if enabled) in compose account */ return SHOW_ACCOUNT_DICT; ("%ABc"|"%addrbook_cc") /* completion of 'Cc' from the address book */ return SHOW_ADDRESSBOOK_COMPLETION_FOR_CC; ("%ABf"|"%addrbook_from") /* completion of 'From' from the address book */ return SHOW_ADDRESSBOOK_COMPLETION_FOR_FROM; @@ -121,7 +120,6 @@ int line = -1; ("?r"|"?references") /* query references */ return QUERY_REFERENCES; ("?af"|"?account_fullname") /* query full name in compose account */ return QUERY_ACCOUNT_FULL_NAME; ("?ao"|"?account_org") /* query organization in compose account */ return QUERY_ACCOUNT_ORGANIZATION; -("?as"|"?account_sig") /* query signature */ return QUERY_ACCOUNT_SIG; ("?aT"|"?account_dict") /* query account main dict enabled */ return QUERY_ACCOUNT_DICT; ("?ABc"|"?addrbook_cc") /* query completion for 'Cc' in address book */ return QUERY_CC_FOUND_IN_ADDRESSBOOK; ("?ABf"|"?addrbook_from") /* query completion for 'From' in address book */ return QUERY_FROM_FOUND_IN_ADDRESSBOOK; @@ -138,7 +136,6 @@ int line = -1; ("!r"|"!references") /* query not(references) */ return QUERY_NOT_REFERENCES; ("!af"|"!account_fullname") /* query not(full name in compose account) */ return QUERY_NOT_ACCOUNT_FULL_NAME; ("!ao"|"!account_org") /* query not(organization in compose account) */ return QUERY_NOT_ACCOUNT_ORGANIZATION; -("!as"|"!account_sig") /* query not(signature) */ return QUERY_NOT_ACCOUNT_SIG; ("!aT"|"!account_dict") /* query not(account main dict enabled and set) */ return QUERY_NOT_ACCOUNT_DICT; ("!ABc"|"!addrbook_cc") /* query not(completion for 'Cc' in address book) */ return QUERY_NOT_CC_FOUND_IN_ADDRESSBOOK; ("!ABf"|"!addrbook_from") /* query not(completion for 'From' in address book) */ return QUERY_NOT_FROM_FOUND_IN_ADDRESSBOOK;