From: William Morgan <wmorgan-sup@masanjin.net>
Date: Tue, 25 Aug 2009 13:53:36 +0000 (-0400)
Subject: Merge branch 'run-mailcap-fixes'
X-Git-Url: https://git.notmuchmail.org/git?a=commitdiff_plain;h=38b3d2167248fd42b7057edf3036215937fe2ed4;p=sup

Merge branch 'run-mailcap-fixes'

Conflicts:
	lib/sup/message-chunks.rb
---

38b3d2167248fd42b7057edf3036215937fe2ed4
diff --cc lib/sup/message-chunks.rb
index 1eda174,1910abd..40e098f
--- a/lib/sup/message-chunks.rb
+++ b/lib/sup/message-chunks.rb
@@@ -131,9 -131,9 +131,9 @@@ EO
      def initial_state; :open end
      def viewable?; @lines.nil? end
      def view_default! path
-       cmd = "/usr/bin/run-mailcap --action=view '#{@content_type}:#{path}' 2>/dev/null"
+       cmd = "/usr/bin/run-mailcap --action=view '#{@content_type}:#{path}'"
 -      Redwood::log "running: #{cmd.inspect}"
 +      debug "running: #{cmd.inspect}"
-       system cmd
+       BufferManager.shell_out(cmd)
        $? == 0
      end