remove elsewhere-deleted messages from window; Refresh -> Get

2 files changed, 2 insertions, 16 deletions

diff --git a/src/cmd/acme/mail/mail.c b/src/cmd/acme/mail/mail.c
index c61f0c12..07d011c2 100644
--- a/src/cmd/acme/mail/mail.c
+++ b/src/cmd/acme/mail/mail.c
@@ -327,6 +327,7 @@ delmesg(char *name, char *digest, int dodel, char *save)
 		if(dodel)
 			mesgmenumarkdel(wbox, &mbox, m, 1);
 		else{
+fprint(2, "message is gone...\n");
 			/* notification came from plumber - message is gone */
 			mesgmenudel(wbox, &mbox, m);
 			if(!m->opened)
@@ -443,21 +444,6 @@ mboxcommand(Window *w, char *s)
 		return 1;
 	}
 	if(strcmp(s, "Get") == 0){
-		if(mbox.dirty){
-			mbox.dirty = 0;
-			fprint(2, "mail: mailbox not written\n");
-			return 1;
-		}
-		winsetaddr(w, ",", 1);
-		if(w->data == nil)
-			w->data = winopenfile(w, "data");
-		fswrite(w->data, "", 0);
-		mesgmenu(wbox, &mbox);
-		winclean(wbox);
-		fswrite(mbox.ctlfd, "refresh", 7);
-		return 1;
-	}
-	if(strcmp(s, "Refresh") == 0){
 		fswrite(mbox.ctlfd, "refresh", 7);
 		return 1;
 	}
diff --git a/src/cmd/acme/mail/mesg.c b/src/cmd/acme/mail/mesg.c
index d21bfed1..9bfe10e1 100644
--- a/src/cmd/acme/mail/mesg.c
+++ b/src/cmd/acme/mail/mesg.c
@@ -561,7 +561,7 @@ mesgmenudel(Window *w, Message *mbox, Message *m)
 
 	if(w->data ==nil)
 		w->data = winopenfile(w, "data");
-	buf = name2regexp(deletedrx, m->name);
+	buf = name2regexp(deletedrx01, m->name);
 	if(winsetaddr(w, buf, 1) && winsetaddr(w, ".,./.*\\n(\t.*\\n)*/", 1))
 		fswrite(w->data, "", 0);
 	free(buf);