X-Git-Url: http://git.marmaro.de/?a=blobdiff_plain;f=uip%2Fanno.c;h=1d27a9e9586e09d29cf3f54385bfbc919fb100f6;hb=8e5be81f784682822f5e868c1bf3c8624682bd23;hp=3a0fa8cbbb7e33dd7d4965dea03de847cb04dffc;hpb=097c84b61603c4a4c5837f3dcc09c30a1e751702;p=mmh

diff --git a/uip/anno.c b/uip/anno.c
index 3a0fa8c..1d27a9e 100644
--- a/uip/anno.c
+++ b/uip/anno.c
@@ -198,7 +198,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);
 	}
@@ -208,13 +208,11 @@ main(int argc, char **argv)
 		datesw = 0;
 #endif /* UCI */
 
-	if (!context_find("path"))
-		free(path("./", TFOLDER));
 	if (!msgs.size)
 		app_msgarg(&msgs, "cur");
 	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");
@@ -244,7 +242,7 @@ main(int argc, char **argv)
 		}
 	}
 
-	context_replace(pfolder, folder);  /* update current folder  */
+	context_replace(curfolder, folder);  /* update current folder  */
 	seq_setcur(mp, mp->lowsel);  /* update current message */
 	seq_save(mp);  /* synchronize message sequences */
 	folder_free(mp);  /* free folder/message structure */