Fix regexp for finding return address fields.

2 files changed, 6 insertions, 2 deletions

diff --git a/lib-src/ChangeLog b/lib-src/ChangeLog
index 6eb5966c01b..c9d246b6904 100644
--- a/lib-src/ChangeLog
+++ b/lib-src/ChangeLog
@@ -1,3 +1,7 @@
+2002-07-29  Jonathan Kamens  <jik@kamens.brookline.ma.us>
+
+        * b2m.pl: Fix regexp for finding return address fields.
+
 2002-07-15  Stefan Monnier  <monnier@cs.yale.edu>
 
         * make-docfile.c (scan_c_file): Warn about missing `usage' info.
diff --git a/lib-src/b2m.pl b/lib-src/b2m.pl
index 9098418d966..665dfe202d5 100644
--- a/lib-src/b2m.pl
+++ b/lib-src/b2m.pl
@@ -30,7 +30,7 @@ use Mail::Address;
 use Date::Parse;
 
 my($whoami) = basename $0;
-my($version) = '$Revision: 1.1 $';
+my($version) = '$Revision: 1.2 $';
 my($usage) = "Usage: $whoami [--help] [--version] [--[no]full-headers] [Babyl-file]
 \tBy default, full headers are printed.\n";
 
@@ -122,7 +122,7 @@ while (<>) {
     }
     else {
         foreach my $addr_header qw(return-path from really-from sender) {
-            if ($full_header =~ /(?:^|\n)$addr_header:\s*((?:\S.*\n)+)/i) {
+            if ($full_header =~ /(?:^|\n)$addr_header:\s*(.*\n(?:\B.*\n)*)/i) {
                 my($addr) = Mail::Address->parse($1);
                 $from_addr = $addr->address($addr);
                 last;