From: Ken Hornstein <kenh@pobox.com>
Date: Sun, 13 Apr 2014 17:11:00 +0000 (-0400)
Subject: If c_termproc is set, include a default display command so the charset
X-Git-Url: https://diplodocus.org/git/nmh/commitdiff_plain/32ad98baacc45bafadf8e33c4e57664029a57694?ds=sidebyside;hp=c90aa732c2bc68f62d9ff0eb43c23d1686b56b48

If c_termproc is set, include a default display command so the charset
conversion pipeline will work correctly.
---

diff --git a/uip/mhshowsbr.c b/uip/mhshowsbr.c
index 85c4c044..e3368d40 100644
--- a/uip/mhshowsbr.c
+++ b/uip/mhshowsbr.c
@@ -508,9 +508,12 @@ show_text (CT ct, int alternate, int concatsw)
      * if it is not a text part of a multipart/alternative
      */
     if (!alternate || ct->c_subtype == TEXT_PLAIN) {
-	if (concatsw)
-	    snprintf(buffer, sizeof(buffer), "%%l");
-	else
+	if (concatsw) {
+	    if (ct->c_termproc)
+		snprintf(buffer, sizeof(buffer), "%%lcat");
+	    else
+		snprintf(buffer, sizeof(buffer), "%%l");
+	} else
 	    snprintf (buffer, sizeof(buffer), "%%l%s %%F", progsw ? progsw :
 		      moreproc && *moreproc ? moreproc : DEFAULT_PAGER);
 	cp = (ct->c_showproc = add (buffer, NULL));