# HG changeset patch
# User Ben Schmidt
# Date 1325610631 -39600
# Node ID 255d277b37db2fd624932d8b01397330b0c37a7e
# Parent  8d2b8248ac9f2cb26e9a55b5ffb33cae6127def2
Allow a space in $originalmail N$ substitution.

diff -r 8d2b8248ac9f -r 255d277b37db ChangeLog
--- a/ChangeLog	Wed Jan 04 04:06:37 2012 +1100
+++ b/ChangeLog	Wed Jan 04 04:10:31 2012 +1100
@@ -1,3 +1,4 @@
+ o Allow a space in $originalmail N$ substitution
  o Add $text T$ substitution
  o Add $$ substitution
  o Allow list texts to include real UTF-8 characters, as documented
diff -r 8d2b8248ac9f -r 255d277b37db src/prepstdreply.c
--- a/src/prepstdreply.c	Wed Jan 04 04:06:37 2012 +1100
+++ b/src/prepstdreply.c	Wed Jan 04 04:10:31 2012 +1100
@@ -484,6 +484,10 @@
 			*tmp = '\0';
 			tmp += 13;
 			str = tmp;
+			if (*tmp == ' ') {
+				tmp++;
+				str = tmp;
+			}
 			while (*tmp >= '0' && *tmp <= '9')
 				tmp++;
 			if (*tmp == '$') {
@@ -516,7 +520,7 @@
 				    log_error(LOG_ARGS, "Could not substitute $originalmail%d$ (mailname == %s)",len,mailname);
 				}
 			} else {
-				log_error(LOG_ARGS, "Bad $originalmailNNN$ substitution");
+				log_error(LOG_ARGS, "Bad $originalmail N$ substitution");
 			}
 			myfree(utfline);
 		} else {