Merge branch 'master' into beta

Conflicts:

	ChangeLog
	configure.ac
	doc/manual.html

1 files changed, 5 insertions, 0 deletions

diff --git a/template.c b/template.c
index 2fe23710..79167667 100644
--- a/template.c
+++ b/template.c
@@ -603,6 +603,7 @@ static int do_Parameter(unsigned char **pp, struct template *pTpl)
 			/* now we fall through the "regular" FromPos code */
 #endif /* #ifdef FEATURE_REGEXP */
 			if(*p == 'F') {
+				pTpe->data.field.field_expand = 0;
 				/* we have a field counter, so indicate it in the template */
 				++p; /* eat 'F' */
 				if (*p == ':') {
@@ -630,7 +631,11 @@ static int do_Parameter(unsigned char **pp, struct template *pTpl)
 							pTpe->data.field.field_delim = 9;
 						  } else {
 							pTpe->data.field.field_delim = iNum;
+							if (*p == '+') {
+								pTpe->data.field.field_expand = 1;
+								p ++;
 							}
+						  }
 					}
 				} else {
 					/* invalid character after F, so we need to reject