From: William Morgan <wmorgan-sup@masanjin.net>
Date: Wed, 26 Mar 2008 16:38:41 +0000 (-0700)
Subject: Merge branch 'master' into next
X-Git-Url: https://git.notmuchmail.org/git?a=commitdiff_plain;h=db4a45630df49f0fd6270a16dad3552cdef8ee43;p=sup

Merge branch 'master' into next
---

db4a45630df49f0fd6270a16dad3552cdef8ee43
diff --cc lib/sup/mbox.rb
index 0abedc0,2494897..f267b3b
--- a/lib/sup/mbox.rb
+++ b/lib/sup/mbox.rb
@@@ -37,12 -37,12 +37,12 @@@ module MBo
  
        ## these next three can occur multiple times, and we want the
        ## first one
 -      when /^(Delivered-To):\s+(.*)$/i,
 -        /^(X-Original-To):\s+(.*)$/i,
 -        /^(Envelope-To):\s+(.*)$/i: header[last = $1] ||= $2
 +      when /^(Delivered-To):\s*(.*)$/i,
 +        /^(X-Original-To):\s*(.*)$/i,
 +        /^(Envelope-To):\s*(.*)$/i: header[last = $1] ||= $2
  
-       when /^$/: break
-       when /^\S+: /: last = nil # some other header we don't care about
+       when /^\r*$/: break
+       when /^\S+:/: last = nil # some other header we don't care about
        else
          header[last] += " " + line.chomp.gsub(/^\s+/, "") if last
        end