From: wmorgan <wmorgan@5c8cc53c-5e98-4d25-b20a-d8db53a31250>
Date: Fri, 5 Jan 2007 21:33:59 +0000 (+0000)
Subject: fixed snippet duplication
X-Git-Url: https://git.notmuchmail.org/git?a=commitdiff_plain;h=281716615c06abda11c73358495452b176e9c047;p=sup

fixed snippet duplication


git-svn-id: svn://rubyforge.org/var/svn/sup/trunk@191 5c8cc53c-5e98-4d25-b20a-d8db53a31250
---

diff --git a/lib/sup/message.rb b/lib/sup/message.rb
index eb1c57d..9975538 100644
--- a/lib/sup/message.rb
+++ b/lib/sup/message.rb
@@ -92,6 +92,7 @@ class Message
     @source = opts[:source] or raise ArgumentError, "source can't be nil"
     @source_info = opts[:source_info] or raise ArgumentError, "source_info can't be nil"
     @snippet = opts[:snippet] || ""
+    @have_snippet = !opts[:snippet].nil?
     @labels = opts[:labels] || []
     @dirty = false
 
@@ -326,8 +327,7 @@ private
         chunk_lines << line
       end
  
-      if state == :text && (@snippet.nil? || @snippet.length < SNIPPET_LEN) &&
-          line !~ /[=\*#_-]{3,}/ && line !~ /^\s*$/
+      if !@have_snippet && state == :text && (@snippet.nil? || @snippet.length < SNIPPET_LEN) && line !~ /[=\*#_-]{3,}/ && line !~ /^\s*$/
         @snippet += " " unless @snippet.empty?
         @snippet += line.gsub(/^\s+/, "").gsub(/[\r\n]/, "").gsub(/\s+/, " ")
         @snippet = @snippet[0 ... SNIPPET_LEN].chomp