From: Antonio Radici <antonio@dyne.org>
Date: Sun, 7 Feb 2010 00:42:02 +0000 (+0000)
Subject: upstream/228671-pipe-mime.patch: don't mess up the terminal while piping attachments... 
X-Git-Tag: 1.5.20-7~6
X-Git-Url: https://git.llucax.com/software/mutt-debian.git/commitdiff_plain/c4de82e1f73a93e2929f7c092aca1efbfc424090?hp=6e0cd7b3aec391b9acd16011500a03d9924f334f

upstream/228671-pipe-mime.patch: don't mess up the terminal while piping attachments (Closes: 228671)
---

diff --git a/debian/changelog b/debian/changelog
index a464d4c..0a2242b 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -19,6 +19,8 @@ mutt (1.5.20-7) unstable; urgency=low
       smime_keys (Closes: 547980, 549006)
     + upstream/528233-readonly-open.patch: open attachments in read-only 
       (Closes: 528233)
+    + upstream/228671-pipe-mime.patch: don't mess up the terminal while piping
+      attachments (Closes: 228671)
     + debian-specific/Muttrc: set time_inc to be 250ms (Closes: 537746)
   * debian/control: 
     + bumping Standards-Version to 3.8.4, nothing to be done
diff --git a/debian/patches/series b/debian/patches/series
index 016361d..7614b5b 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -53,9 +53,10 @@ upstream/553238-german-intl.patch
 upstream/557395-muttrc-crypto.patch
 upstream/545316-header-color.patch
 upstream/568295-references.patch
-
 upstream/547980-smime_keys-chaining.patch
 upstream/528233-readonly-open.patch
+upstream/228671-pipe-mime.patch
+
 misc/hyphen-as-minus.patch
 #misc/manpage-typos.patch
 misc/smime_keys-manpage.patch
diff --git a/debian/patches/upstream/228671-pipe-mime.patch b/debian/patches/upstream/228671-pipe-mime.patch
new file mode 100644
index 0000000..ba49e2d
--- /dev/null
+++ b/debian/patches/upstream/228671-pipe-mime.patch
@@ -0,0 +1,18 @@
+Don't draw imap fetch progress if we aren't in visual mode.
+Drawing progress leaves terminal in confusing state when piping a message
+from pager to less(1). See http://bugs.mutt.org/1771
+
+--- a/imap/message.c
++++ b/imap/message.c
+@@ -489,8 +489,9 @@
+ 	    imap_error ("imap_fetch_message()", buf);
+ 	    goto bail;
+ 	  }
+-	  mutt_progress_init (&progressbar, _("Fetching message..."),
+-			      M_PROGRESS_SIZE, NetInc, bytes);
++          if (!isendwin())
++	    mutt_progress_init (&progressbar, _("Fetching message..."),
++	   		      M_PROGRESS_SIZE, NetInc, bytes);
+ 	  if (imap_read_literal (msg->fp, idata, bytes, &progressbar) < 0)
+ 	    goto bail;
+ 	  /* pick up trailing line */