From da5f00c8cc7f811502a96bd3eb1d552fee4be736 Mon Sep 17 00:00:00 2001 From: Tristan Chabredier Date: Mon, 23 Jul 2007 14:11:43 +0000 Subject: [PATCH] 2007-07-23 [wwp] 2.10.0cvs56 * src/quote_fmt_lex.l Fix typos around long form expressions in the quote lexer. --- ChangeLog | 5 +++++ PATCHSETS | 1 + configure.ac | 2 +- src/quote_fmt_lex.l | 11 +++++++---- 4 files changed, 14 insertions(+), 5 deletions(-) diff --git a/ChangeLog b/ChangeLog index 9cad4cb3f..85f28b257 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ +2007-07-23 [wwp] 2.10.0cvs56 + + * src/quote_fmt_lex.l + Fix typos around long form expressions in the quote lexer. + 2007-07-23 [colin] 2.10.0cvs55 * src/addr_compl.c diff --git a/PATCHSETS b/PATCHSETS index 248bdb797..0ac4d9e84 100644 --- a/PATCHSETS +++ b/PATCHSETS @@ -2709,3 +2709,4 @@ ( cvs diff -u -r 1.115.2.160 -r 1.115.2.161 src/main.c; ) > 2.10.0cvs53.patchset ( 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 diff --git a/configure.ac b/configure.ac index 9126688ed..6f4414f54 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=55 +EXTRA_VERSION=56 EXTRA_RELEASE= EXTRA_GTK2_VERSION= diff --git a/src/quote_fmt_lex.l b/src/quote_fmt_lex.l index 55bf8d360..9f1461edb 100644 --- a/src/quote_fmt_lex.l +++ b/src/quote_fmt_lex.l @@ -95,6 +95,7 @@ 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; @@ -120,10 +121,11 @@ 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; -("?ABt"|"%addrbook_to") /* query completion for 'To' in address book */ return QUERY_TO_FOUND_IN_ADDRESSBOOK; +("?ABt"|"?addrbook_to") /* query completion for 'To' in address book */ return QUERY_TO_FOUND_IN_ADDRESSBOOK; ("!d"|"!date") /* query not(date) */ return QUERY_NOT_DATE; ("!f"|"!from") /* query not(from) */ return QUERY_NOT_FROM; ("!N"|"!F"|"!L"|"!I"|"!fullname"|"!firstname"|"!lastname"|"!initials") /* query not(from name) */ return QUERY_NOT_FULLNAME; @@ -136,13 +138,14 @@ 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; ("!ABt"|"!addrbook_to") /* query not(completion for 'To' in address book) */ return QUERY_NOT_TO_FOUND_IN_ADDRESSBOOK; -("|f"|"!file") /* insert file */ return INSERT_FILE; -("|p"|"!program") /* insert program output */ return INSERT_PROGRAMOUTPUT; -("|i"|"!input") /* insert user input */ return INSERT_USERINPUT; +("|f"|"|file") /* insert file */ return INSERT_FILE; +("|p"|"|program") /* insert program output */ return INSERT_PROGRAMOUTPUT; +("|i"|"|input") /* insert user input */ return INSERT_USERINPUT; "{" return OPARENT; "}" { BEGIN S_NORMAL; return CPARENT; } "{" return OPARENT; -- 2.25.1