X-Git-Url: https://diplodocus.org/git/nmh/blobdiff_plain/28c3595a77a8c942bee1057085776dad0b3d53f4..c9794733:/uip/mhn.c

diff --git a/uip/mhn.c b/uip/mhn.c
index c0b7e781..7363688f 100644
--- a/uip/mhn.c
+++ b/uip/mhn.c
@@ -29,12 +29,8 @@
     X("noheaders", 0, NHEADSW) \
     X("list", 0, LISTSW) \
     X("nolist", 0, NLISTSW) \
-    X("pause", 0, PAUSESW) \
-    X("nopause", 0, NPAUSESW) \
     X("realsize", 0, SIZESW) \
     X("norealsize", 0, NSIZESW) \
-    X("serialonly", 0, SERIALSW) \
-    X("noserialonly", 0, NSERIALSW) \
     X("show", 0, SHOWSW) \
     X("noshow", 0, NSHOWSW) \
     X("store", 0, STORESW) \
@@ -84,8 +80,6 @@ extern char *cache_public;
 extern char *cache_private;
 
 /* mhshowsbr.c */
-extern int pausesw;
-extern int serialsw;
 extern char *progsw;
 extern int nolist;
 extern int nomore;	/* flags for moreproc/header display */
@@ -125,9 +119,6 @@ int part_ok (CT, int);
 int type_ok (CT, int);
 void flush_errors (void);
 
-/* mhshowsbr.c */
-void show_all_messages (CT *);
-
 /* mhstoresbr.c */
 typedef struct mhstoreinfo *mhstoreinfo_t;
 mhstoreinfo_t mhstoreinfo_create(CT *, char *, const char *, int, int);
@@ -244,20 +235,6 @@ do_cache:
 		listsw = 0;
 		continue;
 
-	    case PAUSESW:
-		pausesw = 1;
-		continue;
-	    case NPAUSESW:
-		pausesw = 0;
-		continue;
-
-	    case SERIALSW:
-		serialsw = 1;
-		continue;
-	    case NSERIALSW:
-		serialsw = 0;
-		continue;
-
 	    case SHOWSW:
 		showsw = 1;
 		continue;
@@ -565,6 +542,14 @@ do_cache:
 	mhstoreinfo_free (info);
     }
 
+    /* If reading from a folder, do some updating */
+    if (mp) {
+	context_replace (pfolder, folder);/* update current folder  */
+	seq_setcur (mp, mp->hghsel);	  /* update current message */
+	seq_save (mp);			  /* synchronize sequences  */
+	context_save ();		  /* save the context file  */
+    }
+
     /*
      * Cache the message content
      */
@@ -575,7 +560,7 @@ do_cache:
      * Show the message content
      */
     if (showsw)
-	show_all_messages (cts);
+	show_all_messages (cts, 0, 0, 0, NULL);
 
     /* Now free all the structures for the content */
     for (ctp = cts; *ctp; ctp++)
@@ -584,14 +569,6 @@ do_cache:
     free (cts);
     cts = NULL;
 
-    /* If reading from a folder, do some updating */
-    if (mp) {
-	context_replace (pfolder, folder);/* update current folder  */
-	seq_setcur (mp, mp->hghsel);	  /* update current message */
-	seq_save (mp);			  /* synchronize sequences  */
-	context_save ();		  /* save the context file  */
-    }
-
     done (0);
     return 1;
 }