Commit Diff

Commit:
313c365a29a9a21c47f5f9d842e8aaec8c050742
From:
rsc <devnull@localhost>
Date:
Message:
remove elsewhere-deleted messages from window; Refresh -> Get
Actions:
Patch | Tree
commit - 7cc0e47fa896d9261d8f6e9787ffd6a36a746dd1
commit + 313c365a29a9a21c47f5f9d842e8aaec8c050742
blob - c61f0c126e264ba37dc588f02fcf8b7a7a54c00e
blob + 07d011c288fe126ada05024eb61ea0697bdc92fa
--- src/cmd/acme/mail/mail.c
+++ src/cmd/acme/mail/mail.c
@@ -327,6 +327,7 @@ delmesg(char *name, char *digest, int dodel, char *sav
 		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,24 +444,9 @@ 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;
-	}
 	if(strcmp(s, "Delmesg") == 0){
 		save = nil;
 		if(nargs > 1)
blob - d21bfed109a92820e0cb1a86fa701a8a5aaa816a
blob + 9bfe10e152e79b2a6b85fe7b9ae8d9fdd3a659f3
--- src/cmd/acme/mail/mesg.c
+++ 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);