debian/extra/lib/mailto-mutt: patch from madduck@ to correctly handle the way mutt...

diff --git a/debian/changelog b/debian/changelog
index 2256af12f6fe024a1a69562e4ab677f449fb9f2f..7b1ba7baa8a1a8614d4f22abe3433aa0b201def4 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -13,6 +13,8 @@ mutt (1.5.20-3) UNRELEASED; urgency=low
       connection, as it was before 1.5.20 (Closes: 535096)
   * debian/control:
     + Standards-Version bumped to 3.8.3
+  * debian/extra/lib/mailto-mutt: patch from madduck@ to correctly handle the
+    way mutt is parsing the command line now (Closes: 545876)  
 
  -- Antonio Radici <antonio@dyne.org>  Sat, 15 Aug 2009 00:32:49 +0100
 

diff --git a/debian/extra/lib/mailto-mutt b/debian/extra/lib/mailto-mutt
index 82f30674ccd78b49aa5079289ba52fe9aecc48fb..730c0210f96774db1562cbbd9703e68d9e01e6be 100755 (executable)
--- a/debian/extra/lib/mailto-mutt
+++ b/debian/extra/lib/mailto-mutt
@@ -92,12 +92,13 @@ fi
 
 mutt_args="${mutt_args:+$mutt_args }$(get_addr_args -c $cc)"
 mutt_args="${mutt_args:+$mutt_args }$(get_addr_args -b $bcc)"
-mutt_args="${mutt_args:+$mutt_args }$(get_addr_args $MAILTO)"
+mutt_args="${mutt_args:+$mutt_args }-- $(get_addr_args $MAILTO)"
 
 run()
 {
   if [ ${debug:-0} -eq 1 ]; then
     echo "$@"
+    [ -t 0 ] && [ -t 1 ] && [ -t 2 ] && $SHELL
   else
     eval "$@"
   fi
@@ -105,12 +106,12 @@ run()
 
 if [ -n "$body" ]; then
   TMPFILE="$(tempfile -p mailto -d /tmp)"
+  trap "rm -f $TMPFILE" 0 1 2 3 4 5 6 7 8 10 11 12 13 14 15
   echo "$body" > $TMPFILE
-  trap "rm -f $TMPFILE" 0 1 2 3 4 5 6 7 8 9 10 11 12 13 14 15
-  run x-terminal-emulator -e mutt${mutt_args:+ $mutt_args} -i $TMPFILE
+  run x-terminal-emulator -e mutt -i $TMPFILE${mutt_args:+ $mutt_args}
   ret=$?
   rm -f $TMPFILE
-  trap - 0 1 2 3 4 5 6 7 8 9 10 11 12 13 14 15
+  trap - 0 1 2 3 4 5 6 7 8 10 11 12 13 14 15
   exit $ret
 else
   run exec x-terminal-emulator -e mutt${mutt_args:+ $mutt_args}