etc/replcomps, etc/replgroupcomps: Trim trailing whitespace from

Subject field (patch from Eric Gillespie)

diff --git a/ChangeLog b/ChangeLog
index d76efca..39aab9a 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2008-08-03  Eric Gillespie  <epg@pretzelnet.org>
+
+       * etc/replcomps, etc/replgroupcomps: Trim trailing whitespace from
+       Subject field.
+
 2008-08-03  Peter Maydell  <pmaydell@chiark.greenend.org.uk>
 
        * sbr/fmt_compile.c: when doing an if-test on the result
@@ -5,7 +10,7 @@
        the string is non-empty (as the documentation says we do).
        Previously we were always testing the integer 'value'. Bug
        spotted by Eric Gillespie.
-       * test/tests/repl/test-if-str: test case for this bug.
+       * test/tests/repl/test-if-str: test case for this bug
 
 2008-07-24  Eric Gillespie  <epg@pretzelnet.org>
 

diff --git a/etc/replcomps b/etc/replcomps
index 6ec3ce7..9166411 100644 (file)
--- a/etc/replcomps
+++ b/etc/replcomps
@@ -20,7 +20,7 @@
 %(formataddr(me))\
 %(void(width))%(putaddr cc: )
 Fcc: %<{fcc}%{fcc}%|+outbox%>
-Subject: %<{subject}Re: %{subject}%>
+Subject: %<{subject}Re: %(void{subject})%(trim)%(putstr)%>
 %;
 %; Make References: and In-reply-to: fields for threading.
 %; Use (void), (trim) and (putstr) to eat trailing whitespace.

diff --git a/etc/replgroupcomps b/etc/replgroupcomps
index 7920544..210a3e0 100644 (file)
--- a/etc/replgroupcomps
+++ b/etc/replgroupcomps
@@ -29,7 +29,7 @@
 %<(nonnull)%(void(width))%(putaddr cc: )\n%>%>\
 %;
 Fcc: %<{fcc}%{fcc}%|+outbox%>
-Subject: %<{subject}Re: %{subject}%>
+Subject: %<{subject}Re: %(void{subject})%(trim)%(putstr)%>
 %;
 %; Make References: and In-reply-to: fields for threading.
 %; Use (void), (trim) and (putstr) to eat trailing whitespace.