]> git.cworth.org Git - sup/commitdiff
Merge branch 'string-split-fixes' into next
authorWilliam Morgan <wmorgan-sup@masanjin.net>
Wed, 13 May 2009 20:53:47 +0000 (13:53 -0700)
committerWilliam Morgan <wmorgan-sup@masanjin.net>
Wed, 13 May 2009 20:53:47 +0000 (13:53 -0700)
Conflicts:
lib/sup/index.rb

1  2 
bin/sup-sync
lib/sup/buffer.rb
lib/sup/index.rb
lib/sup/poll.rb

diff --cc bin/sup-sync
Simple merge
Simple merge
index c66a24eac428ab7256ea237db16c42e126189dd7,853bf7603556df49e97d6926eb9969cf4187168e..c7838eb43d534a7d03ddad7bda2a612812564b39
@@@ -408,16 -409,14 +408,16 @@@ EO
          "date" => Time.at(doc[:date].to_i),
          "subject" => unwrap_subj(doc[:subject]),
          "from" => doc[:from],
-         "to" => doc[:to].split(/\s+/).join(", "), # reformat
+         "to" => doc[:to].split.join(", "), # reformat
          "message-id" => doc[:message_id],
-         "references" => doc[:refs].split(/\s+/).map { |x| "<#{x}>" }.join(" "),
+         "references" => doc[:refs].split.map { |x| "<#{x}>" }.join(" "),
        }
  
 -      Message.new :source => source, :source_info => doc[:source_info].to_i,
 +      m = Message.new :source => source, :source_info => doc[:source_info].to_i,
-                   :labels => doc[:label].split(" ").map { |s| s.intern },
+                   :labels => doc[:label].symbolistize,
 -                  :snippet => doc[:snippet], :header => fake_header
 +                  :snippet => doc[:snippet]
 +      m.parse_header fake_header
 +      m
      end
    end
  
diff --cc lib/sup/poll.rb
Simple merge