Merge branch 'ph/send-email'

[git.git] / git-send-email.perl

diff --git a/git-send-email.perl b/git-send-email.perl
index 9039cfde06529847fe62f1fe97eb9240b5fdb1d6..7508f8ff242854462d0b5b505621dd840b551641 100755 (executable)
--- a/git-send-email.perl
+++ b/git-send-email.perl
@@ -374,10 +374,13 @@ my %parse_alias = (
                        # spaces delimit multiple addresses
                        $aliases{$1} = [ split(/\s+/, $2) ];
                }}},
-       pine => sub { my $fh = shift; while (<$fh>) {
-               if (/^(\S+)\t.*\t(.*)$/) {
+       pine => sub { my $fh = shift; my $f='\t[^\t]*';
+               for (my $x = ''; defined($x); $x = $_) {
+                       chomp $x;
+                       $x .= $1 while(defined($_ = <$fh>) && /^ +(.*)$/);
+                       $x =~ /^(\S+)$f\t\(?([^\t]+?)\)?(:?$f){0,2}$/ or next;
                        $aliases{$1} = [ split(/\s*,\s*/, $2) ];
-               }}},
+               }},
        gnus => sub { my $fh = shift; while (<$fh>) {
                if (/\(define-mail-alias\s+"(\S+?)"\s+"(\S+?)"\)/) {
                        $aliases{$1} = [ $2 ];