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 85c4c044a3b483c71a4e3af109f806138ad909ef..e3368d407461d95299d93c1c30445385023cd181 100644 (file)
--- 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 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));
            snprintf (buffer, sizeof(buffer), "%%l%s %%F", progsw ? progsw :
                      moreproc && *moreproc ? moreproc : DEFAULT_PAGER);
        cp = (ct->c_showproc = add (buffer, NULL));