X-Git-Url: http://git.marmaro.de/?a=blobdiff_plain;f=uip%2Fpick.c;h=e4d1370440d089a26b6f4b2810b551c749d85d02;hb=67411b1f95d6ec987b4c732459e1ba8a8ac192c6;hp=f0dcec374c03d72717c912cd538a1eb576e831c8;hpb=3d78b9c80a95f4e7885ed607018f9b1b9be559b4;p=mmh

diff --git a/uip/pick.c b/uip/pick.c
index f0dcec3..e4d1370 100644
--- a/uip/pick.c
+++ b/uip/pick.c
@@ -182,7 +182,7 @@ main(int argc, char **argv)
 			if (folder)
 				adios(NULL, "only one folder at a time!");
 			else
-				folder = pluspath(cp);
+				folder = getcpy(expandfol(cp));
 		} else
 			app_msgarg(&msgs, cp);
 	}
@@ -193,11 +193,11 @@ main(int argc, char **argv)
 	** then search the whole folder.
 	*/
 	if (!msgs.size)
-		app_msgarg(&msgs, "all");
+		app_msgarg(&msgs, seq_all);
 
 	if (!folder)
-		folder = getfolder(FCUR);
-	maildir = m_maildir(folder);
+		folder = getcurfol();
+	maildir = toabsdir(folder);
 
 	if (chdir(maildir) == NOTOK)
 		adios(maildir, "unable to change directory to");
@@ -288,7 +288,7 @@ main(int argc, char **argv)
 		printf("%d hit%s\n", mp->numsel, mp->numsel == 1 ? "" : "s");
 	}
 
-	context_replace(pfolder, folder);  /* update current folder */
+	context_replace(curfolder, folder);  /* update current folder */
 	seq_save(mp);  /* synchronize message sequences */
 	context_save();  /* save the context file */
 	folder_free(mp);  /* free folder/message structure */