X-Git-Url: https://diplodocus.org/git/nmh/blobdiff_plain/71e45cde42e178b7eed46fbe9c86f8c1c56f50d3..17b9beb40640e8731143f61e3b94756f3e77d20c:/uip/refile.c

diff --git a/uip/refile.c b/uip/refile.c
index 1d44b362..8a4392b7 100644
--- a/uip/refile.c
+++ b/uip/refile.c
@@ -206,7 +206,7 @@ main (int argc, char **argv)
 	adios (maildir, "unable to change directory to");
 
     /* read source folder and create message structure */
-    if (!(mp = folder_read (folder)))
+    if (!(mp = folder_read (folder, 1)))
 	adios (NULL, "unable to read folder %s", folder);
 
     /* check for empty folder */
@@ -239,16 +239,19 @@ main (int argc, char **argv)
     }
 
     /*
-     * This is a hack.  If we are using an external rmmproc,
-     * then save the current folder to the context file,
-     * so the external rmmproc will remove files from the correct
-     * directory.  This should be moved to folder_delmsgs().
+     * Update this now, since folder_delmsgs() will save the context
+     * but doesn't have access to the folder name.
      */
-    if (rmmproc) {
-	context_replace (pfolder, folder);
-	context_save ();
-	fflush (stdout);
-    }
+
+    context_replace (pfolder, folder);	/* update current folder   */
+
+    /*
+     * Adjust "cur" if necessary
+     */
+
+    if (mp->hghsel != mp->curmsg
+	&& (mp->numsel != mp->nummsg || linkf))
+	seq_setcur (mp, mp->hghsel);
 
     /* If -nolink, then "remove" messages from source folder.
      *
@@ -257,17 +260,13 @@ main (int argc, char **argv)
      */
     if (!linkf) {
 	folder_delmsgs (mp, unlink_msgs, 1);
+    } else {
+	seq_save (mp);	/* synchronize message sequences */
+	context_save ();			/* save the context file   */
     }
 
     clsfolds (folders, foldp);
 
-    if (mp->hghsel != mp->curmsg
-	&& (mp->numsel != mp->nummsg || linkf))
-	seq_setcur (mp, mp->hghsel);
-    seq_save (mp);	/* synchronize message sequences */
-
-    context_replace (pfolder, folder);	/* update current folder   */
-    context_save ();			/* save the context file   */
     folder_free (mp);			/* free folder structure   */
     done (0);
     return 1;
@@ -294,7 +293,7 @@ opnfolds (struct st_fold *folders, int nfolders)
 
 	if (chdir (nmaildir) == NOTOK)
 	    adios (nmaildir, "unable to change directory to");
-	if (!(mp = folder_read (fp->f_name)))
+	if (!(mp = folder_read (fp->f_name, 1)))
 	    adios (NULL, "unable to read folder %s", fp->f_name);
 	mp->curmsg = 0;