From: William Morgan <wmorgan-sup@masanjin.net>
Date: Tue, 22 Jan 2008 20:21:53 +0000 (-0800)
Subject: Merge branches 'prev-next-improv', 'fix-warnings', 'mime-view', 'charset', 'join... 
X-Git-Url: https://git.notmuchmail.org/git?a=commitdiff_plain;h=f7b27c55c1be05de3d7952f6a7cf630142e0bbcd;p=sup

Merge branches 'prev-next-improv', 'fix-warnings', 'mime-view', 'charset', 'join-threads', 'quoteline', 'maildir-fix' and 'regex-fix'
---

f7b27c55c1be05de3d7952f6a7cf630142e0bbcd
diff --cc lib/sup/message.rb
index ef5e3d1,bd37162,65aebd5,651c839,bd37162,65aebd5..853f2fc
--- a/lib/sup/message.rb
+++ b/lib/sup/message.rb
@@@@@@@ -29,7 -29,7 -29,7 -29,7 -29,7 -29,7 +29,7 @@@@@@@ class Messag
      
        QUOTE_PATTERN = /^\s{0,4}[>|\}]/
        BLOCK_QUOTE_PATTERN = /^-----\s*Original Message\s*----+$/
 -- --  QUOTE_START_PATTERN = /(^\s*Excerpts from)|(^\s*In message )|(^\s*In article )|(^\s*Quoting )|((wrote|writes|said|says)\s*:\s*$)/
   -    QUOTE_START_PATTERN = /\w/
 +++++  QUOTE_START_PATTERN = /\w.*:$/
        SIG_PATTERN = /(^-- ?$)|(^\s*----------+\s*$)|(^\s*_________+\s*$)|(^\s*--~--~-)|(^\s*--\+\+\*\*==)/
      
        MAX_SIG_DISTANCE = 15 # lines from the end
@@@@@@@ -420,7 -420,7 -417,7 -435,7 -420,7 -417,7 +435,7 @@@@@@@ privat
            when :text
              newstate = nil
      
 -- --        if line =~ QUOTE_PATTERN || (line =~ QUOTE_START_PATTERN && (nextline =~ QUOTE_PATTERN || nextline =~ QUOTE_START_PATTERN))
   -          if line =~ QUOTE_START_PATTERN && nextline =~ QUOTE_PATTERN
 +++++        if line =~ QUOTE_PATTERN || (line =~ QUOTE_START_PATTERN && nextline =~ QUOTE_PATTERN)
                newstate = :quote
              elsif line =~ SIG_PATTERN && (lines.length - i) < MAX_SIG_DISTANCE
                newstate = :sig