X-Git-Url: https://diplodocus.org/git/nmh/blobdiff_plain/82bf8d740b1a226c02473c4f31358fac6e4e0386..4c8279307f5959223cdfef84ef167e10f0ea4f23:/uip/mhshowsbr.c

diff --git a/uip/mhshowsbr.c b/uip/mhshowsbr.c
index 68a07f7b..7454d182 100644
--- a/uip/mhshowsbr.c
+++ b/uip/mhshowsbr.c
@@ -300,7 +300,7 @@ show_content (CT ct, int alternate, int textonly, int inlineonly,
      * the content-type.
      */
 
-    if (textonly || (inlineonly && is_inline(ct))) {
+    if (textonly || (inlineonly && !is_inline(ct))) {
 	output_marker(ct, fmt);
 	return OK;
     }
@@ -358,12 +358,12 @@ show_content_aux (CT ct, int alternate, char *cp, char *cracked)
            some code rearrangement.  And to make this really ugly,
            only do it in mhshow, not mhfixmsg, mhn, or mhstore. */
         if (convert_content_charset (ct, &file) == OK) {
-            close_encoding (ct);
+            (*ct->c_ceclosefnx) (ct);
             if ((fd = (*ct->c_ceopenfnx) (ct, &file)) == NOTOK)
                 return NOTOK;
         } else {
-            admonish (NULL, "unable to convert character set%s to %s",
-                      ct->c_partno  ?  "of part "  :  "",
+            admonish (NULL, "unable to convert character set%s%s to %s",
+                      ct->c_partno  ?  " of part "  :  "",
                       ct->c_partno  ?  ct->c_partno  :  "",
                       content_charset (ct));
         }