Merge remote-tracking branch 'origin' into convertargs

[nmh] / uip / mhshow.c

diff --git a/uip/mhshow.c b/uip/mhshow.c
index c3e23c492d02738cc0f5856b1a529cdffa9c6f3c..0227d0c2ff798045dabd92e473998c9218c79858 100644 (file)
--- a/uip/mhshow.c
+++ b/uip/mhshow.c
@@ -182,7 +182,7 @@ do_cache:
                inlineonly = 1;
                continue;
            case NINLINESW:
-               inlineonly = 1;
+               inlineonly = 0;
                continue;
 
            case PARTSW:
@@ -314,7 +314,7 @@ do_cache:
      * check if message is coming from file
      */
     if (file) {
-       if (!(cts = (CT *) calloc ((size_t) 2, sizeof(*cts))))
+       if (!(cts = (CT *) mh_xcalloc ((size_t) 2, sizeof(*cts))))
            adios (NULL, "out of memory");
        ctp = cts;
 
@@ -358,7 +358,7 @@ do_cache:
        seq_setprev (mp);       /* set the Previous-Sequence */
        seq_setunseen (mp, 1);  /* unset the Unseen-Sequence */
 
-       if (!(cts = (CT *) calloc ((size_t) (mp->numsel + 1), sizeof(*cts))))
+       if (!(cts = (CT *) mh_xcalloc ((size_t) (mp->numsel + 1), sizeof(*cts))))
            adios (NULL, "out of memory");
        ctp = cts;
 
@@ -406,7 +406,7 @@ do_cache:
        context_save ();                  /* save the context file  */
     }
 
-    if (concat)
+    if (concatsw)
        m_popen(moreproc, 0);
 
     /*
@@ -421,7 +421,7 @@ do_cache:
     free ((char *) cts);
     cts = NULL;
 
-    if (concat)
+    if (concatsw)
        m_pclose();
 
     done (0);