From: Ken Hornstein <kenh@pobox.com>
Date: Wed, 9 Apr 2014 20:25:08 +0000 (-0400)
Subject: Merge branch 'mhshow-fixup'
X-Git-Url: https://diplodocus.org/git/nmh/commitdiff_plain/b43e55a89e0fd66e1bf968fed25feacfbd045514?hp=-c

Merge branch 'mhshow-fixup'
---

b43e55a89e0fd66e1bf968fed25feacfbd045514
diff --combined uip/mhn.c
index 3fd2d39c,a2733ad2..7363688f
--- a/uip/mhn.c
+++ b/uip/mhn.c
@@@ -119,9 -119,6 +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);
@@@ -545,14 -542,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
       */
@@@ -563,7 -552,7 +560,7 @@@
       * 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++)
@@@ -572,6 -561,14 +569,6 @@@
      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;
  }