head	1.9;
access;
symbols
	RELEASE_4_2_0:1.8
	RELEASE_4_1_1:1.8
	RELEASE_4_1_0:1.8
	RELEASE_3_5_0:1.8
	RELEASE_4_0_0:1.8
	RELEASE_3_4_0:1.8
	RELEASE_3_3_0:1.7
	RELEASE_3_2_0:1.7
	RELEASE_3_1_0:1.6
	RELEASE_2_2_8:1.6
	RELEASE_3_0_0:1.6
	RELEASE_2_2_7:1.2
	RELEASE_2_2_6:1.1;
locks; strict;
comment	@# @;


1.9
date	2000.11.17.19.06.53;	author keith;	state dead;
branches;
next	1.8;

1.8
date	99.11.01.00.40.57;	author steve;	state Exp;
branches;
next	1.7;

1.7
date	99.03.15.01.45.42;	author steve;	state Exp;
branches;
next	1.6;

1.6
date	98.10.10.04.29.24;	author steve;	state Exp;
branches;
next	1.5;

1.5
date	98.08.24.01.24.43;	author steve;	state Exp;
branches;
next	1.4;

1.4
date	98.08.09.00.51.26;	author steve;	state Exp;
branches;
next	1.3;

1.3
date	98.07.30.12.30.39;	author vanilla;	state Exp;
branches;
next	1.2;

1.2
date	98.07.21.14.11.40;	author vanilla;	state Exp;
branches;
next	1.1;

1.1
date	98.02.02.14.34.37;	author vanilla;	state Exp;
branches;
next	;


desc
@@


1.9
log
@Upgrade from 4.21 to 4.30.

Especially thanks to the maintainer, Tai-hwa Liang (avatar), for
ending those long lasting evil +400k files/patch-*. :-)

According to kkenn, pine4's security will exist until it's totally
rewritten, so I'll leave pkg-install untouched, which shows the
security warning.
PR:		ports/22436
@
text
@--- pine/mailpart.c.orig	Wed Oct 13 01:07:42 1999
+++ pine/mailpart.c	Thu Oct 14 12:25:59 1999
@@@@ -142,18 +142,18 @@@@
        {HELP_MENU,
 	OTHER_MENU,
 	{"<",NULL,{MC_EXIT,2,{'<',','}},KS_EXITMODE},
-	{">","[View]",{MC_VIEW_ATCH,5,{'v','>','.',ctrl('M'),ctrl('J')}},
+	{">","[˵]",{MC_VIEW_ATCH,5,{'v','>','.',ctrl('M'),ctrl('J')}},
 	  KS_VIEW},
-	{"P", "PrevAttch",{MC_PREVITEM,4,{'p',ctrl('B'),ctrl('P'),KEY_UP}},
+	{"P", "e@@",{MC_PREVITEM,4,{'p',ctrl('B'),ctrl('P'),KEY_UP}},
 	  KS_PREVMSG},
-	{"N", "NextAtch",
+	{"N", "@@",
 	 {MC_NEXTITEM, 5, {'n','\t',ctrl('F'),ctrl('N'), KEY_DOWN}},
 	 KS_NEXTMSG},
 	PREVPAGE_MENU,
 	NEXTPAGE_MENU,
 	DELETE_MENU,
 	UNDELETE_MENU,
-	{"S", "Save", {MC_SAVETEXT,1,{'s'}}, KS_SAVE},
+	{"S", "s", {MC_SAVETEXT,1,{'s'}}, KS_SAVE},
 	{NULL, NULL, {MC_EXPORT, 1, {'e'}}, KS_EXPORT},
 
 	HELP_MENU,
@@@@ -162,9 +162,9 @@@@
 	QUIT_MENU,
 	PIPE_MENU,
 	BOUNCE_MENU,
-	{"A","AboutAttch",{MC_ABOUTATCH,1,{'a'}},KS_NONE},
+	{"A","",{MC_ABOUTATCH,1,{'a'}},KS_NONE},
 	WHEREIS_MENU,
-	{"%", "Print", MC_PRINTMSG,1,{'%'}, KS_PRINT},
+	{"%", "CL", MC_PRINTMSG,1,{'%'}, KS_PRINT},
 	INDEX_MENU,
 	REPLY_MENU,
 	FORWARD_MENU};
@@@@ -182,10 +182,10 @@@@
        {HELP_MENU,
 	OTHER_MENU,
 	{"<",NULL,{MC_EXIT,2,{'<',','}},KS_EXITMODE},
-	{"Ret","[View Hilite]",{MC_VIEW_HANDLE,3,
+	{"Ret","[˵ Hilite]",{MC_VIEW_HANDLE,3,
 				{ctrl('m'),ctrl('j'),KEY_RIGHT}},KS_NONE},
-	{"^B","Prev URL",{MC_PREV_HANDLE,1,{ctrl('B')}},KS_NONE},
-	{"^F","Next URL",{MC_NEXT_HANDLE,1,{ctrl('F')}},KS_NONE},
+	{"^B","e@@ URL",{MC_PREV_HANDLE,1,{ctrl('B')}},KS_NONE},
+	{"^F","@@ URL",{MC_NEXT_HANDLE,1,{ctrl('F')}},KS_NONE},
 	PREVPAGE_MENU,
 	NEXTPAGE_MENU,
 	DELETE_MENU,
@@@@ -201,7 +201,7 @@@@
 	BOUNCE_MENU,
 	NULL_MENU,
 	WHEREIS_MENU,
-	{"%", "Print", MC_PRINTMSG,1,{'%'}, KS_PRINT},
+	{"%", "CL", MC_PRINTMSG,1,{'%'}, KS_PRINT},
 	NULL_MENU,
 	REPLY_MENU,
 	FORWARD_MENU};
@@@@ -338,12 +338,12 @@@@
 
     if(mn_total_cur(ps->msgmap) > 1L){
 	q_status_message(SM_ORDER | SM_DING, 0, 3,
-			 "Can only view one message's attachments at a time.");
+			 "P@@ɶȯ˵@@ʫHI");
 	return;
     }
     else if(ps->atmts && ps->atmts->description && !(ps->atmts + 1)->description)
       q_status_message1(SM_ASYNC, 0, 3,
-	"Message %s has only one part (the message body), and no attachments.",
+        "H %s Ȧ@@(H)ASC",
 	long2string(mn_get_cur(ps->msgmap)));
 
     /*
@@@@ -486,7 +486,7 @@@@
 	  break;
 
 	if(ps->mangled_header){
-	    set_titlebar("ATTACHMENT INDEX", ps->mail_stream,
+	    set_titlebar("", ps->mail_stream,
 			 ps->context_current, ps->cur_folder, ps->msgmap, 1,
 			 MessageNumber, 0, 0);
 	    ps->mangled_header = 0;
@@@@ -524,7 +524,7 @@@@
 	    last_type	       = current->attp->body->type;
 	    last_subtype       = current->attp->body->subtype;
 
-	    sprintf(backtag, "Msg #%ld", mn_get_cur(ps->msgmap));
+	    sprintf(backtag, "H #%ld", mn_get_cur(ps->msgmap));
 	    km->keys[ATT_PARENT_KEY].label = backtag;
 
 	    if(F_OFF(F_ENABLE_PIPE, ps))
@@@@ -550,7 +550,7 @@@@
 		  clrbitn(ATT_PRINT_KEY, bitmap);
 
 		km->keys[ATT_EXPORT_KEY].name  = "E";
-		km->keys[ATT_EXPORT_KEY].label = "Export";
+		km->keys[ATT_EXPORT_KEY].label = "ץX";
 	    }
 
 	    if(km_popped){
@@@@ -616,7 +616,7 @@@@
 		break;
 	    }
 
-	    helper(h_attachment_screen, "HELP FOR ATTACHMENT INDEX", 0);
+	    helper(h_attachment_screen, "ުU", 0);
 	    ps->mangled_screen = 1;
 	    break;
 
@@@@ -645,7 +645,7 @@@@
 	    if(ctmp = next_attline(current))
 	      current = ctmp;
 	    else
-	      q_status_message(SM_ORDER, 0, 1, "Already on last attachment");
+	      q_status_message(SM_ORDER, 0, 1, "wg̫@@F");
 
 	    break;
 
@@@@ -653,7 +653,7 @@@@
 	    if(ctmp = prev_attline(current))
 	      current = ctmp;
 	    else
-	      q_status_message(SM_ORDER, 0, 1, "Already on first attachment");
+	      q_status_message(SM_ORDER, 0, 1, "wgĤ@@ӪF");
 
 	    break;
 
@@@@ -667,7 +667,7 @@@@
 	    }
 	    else
 	      q_status_message(SM_ORDER, 0, 1,
-			       "Already on last page of attachments");
+			       "wgb󪺳̫@@F");
 	    
 
 	    break;
@@@@ -688,7 +688,7 @@@@
 	    }
 	    else
 	      q_status_message(SM_ORDER, 0, 1,
-			       "Already on first page of attachments");
+			       "wgb󪺲Ĥ@@F");
 
 	    break;
 
@@@@ -1150,7 +1150,7 @@@@
 {
     bitmap_t	 bitmap;
 
-    set_titlebar("ATTACHMENT INDEX", ps_global->mail_stream,
+    set_titlebar("", ps_global->mail_stream,
 		 ps_global->context_current, ps_global->cur_folder,
 		 ps_global->msgmap, 1, FolderName,0,0);
 
@@@@ -1318,7 +1318,7 @@@@
     gf_io_t     pc;
     STORE_S    *store;
     static ESCKEY_S att_save_opts[] = {
-	{ctrl('T'), 10, "^T", "To Files"},
+	{ctrl('T'), 10, "^T", "ɮצC"},
 	{-1, 0, NULL, NULL},
 	{-1, 0, NULL, NULL},
 	{-1, 0, NULL, NULL}};
@@@@ -1347,7 +1347,7 @@@@
 	att_save_opts[++r].ch  = ctrl('V');
 	att_save_opts[r].rval  = 12;
 	att_save_opts[r].name  = "^V";
-	att_save_opts[r].label = "Downld Msg";
+	att_save_opts[r].label = "UH";
     }
 #endif	/* !(DOS || MAC) */
 
@@@@ -1355,7 +1355,7 @@@@
 	att_save_opts[++r].ch  =  ctrl('I');
 	att_save_opts[r].rval  = 11;
 	att_save_opts[r].name  = "TAB";
-	att_save_opts[r].label = "Complete";
+	att_save_opts[r].label = "";
     }
 
     att_save_opts[++r].ch = -1;
@@@@ -1389,7 +1389,7 @@@@
 
 	if(ps_global->restricted){
 	    q_status_message(SM_ORDER | SM_DING, 3, 3,
-			     "Download disallowed in restricted mode");
+			     "Ҧ\\U");
 	    return;
 	}
 
@@@@ -1397,7 +1397,7 @@@@
 	tfp = temp_nam(NULL, "pd");
 	dprint(1, (debugfile, "Download attachment called!\n"));
 	if(store = so_get(FileStar, tfp, WRITE_ACCESS|OWNER_ONLY)){
-	    sprintf(prompt_buf, "Saving to \"%.50s\"", tfp);
+	    sprintf(prompt_buf, "bsJ \"%.50s\"", tfp);
 	    we_cancel = init_att_progress(prompt_buf,
 					  ps_global->mail_stream,
 					  a->body);
@@@@ -1406,7 +1406,7 @@@@
 	    if(err = detach(ps_global->mail_stream, msgno,
 			    a->number, &len, pc, NULL))
 	      q_status_message2(SM_ORDER | SM_DING, 3, 5,
-				"%s: Error writing attachment to \"%s\"",
+				"%s: \\gJ \"%s\" ɵoͿ~",
 				err, tfp);
 
 	    /* cancel regardless, so it doesn't get in way of xfer */
@@@@ -1423,18 +1423,18 @@@@
 		  (void)close_system_pipe(&syspipe);
 		else
 		  q_status_message(SM_ORDER | SM_DING, 3, 3,
-				   err = "Error running download command");
+				   err = "UROɵoͿ~");
 	    }
 
 	    unlink(tfp);
 	}
 	else
 	  q_status_message(SM_ORDER | SM_DING, 3, 3,
-			   err = "Error building temp file for download");
+			   err = "إ߼ȦsɮɵoͿ~");
 
 	fs_give((void **)&tfp);
 	if(!err)
-	  q_status_message1(SM_ORDER, 0, 4, "Part %s downloaded",
+	  q_status_message1(SM_ORDER, 0, 4, "wU %s ",
 			    a->number);
 			    
 	return;
@@@@ -1446,12 +1446,12 @@@@
 
     if((store = so_get(FileStar, full_filename, WRITE_ACCESS)) == NULL){
 	q_status_message2(SM_ORDER | SM_DING, 3, 5,
-			  "Error opening destination %s: %s",
+			  "}ҥئa %s ɵoͿ~G%s",
 			  full_filename, error_description(errno));
 	return;
     }
 
-    sprintf(prompt_buf, "Saving to \"%.50s\"", full_filename);
+    sprintf(prompt_buf, "bsJ \"%.50s\"", full_filename);
     we_cancel = init_att_progress(prompt_buf, ps_global->mail_stream, a->body);
 
     gf_set_so_writec(&pc, store);
@@@@ -1470,7 +1470,7 @@@@
 	  truncate(full_filename, (over == -1) ? orig_size : 0);
 
 	q_status_message2(SM_ORDER | SM_DING, 3, 5,
-			  "%s: Error writing attachment to \"%s\"",
+			  "%sGgJ \"%s\" ɵoͿ~",
 			  err, full_filename);
     }
     else{
@@@@ -1548,7 +1548,7 @@@@
     MESSAGECACHE *mc;
     STORE_S      *so;
 
-    sprintf(nmsgs, "Attached Msg (part %s) ", a->number);
+    sprintf(nmsgs, "[H ( %s ) ", a->number);
     if(save_prompt(ps_global, &cntxt, newfolder, nmsgs,
 		   a->body->nested.msg->env, msgno, a->number)){
 	save_folder = (strucmp(newfolder, ps_global->inbox_name) == 0)
@@@@ -1570,11 +1570,11 @@@@
 				   a->body->size.bytes, flags, date, so);
 	    if(rv == 1)
 	      q_status_message2(SM_ORDER, 0, 4,
-				"Attached message (part %s) saved to \"%s\"",
+				"[ digest( %s ) s \"%s\"",
 				a->number, 
 				save_folder);
 	    else if(rv == -1)
-	      cmd_cancelled("Attached message Save");
+	      cmd_cancelled("sJ[T");
 	    /* else whatever broke in save_fetch_append shoulda bitched */
 
 	    so_give(&so);
@@@@ -1616,7 +1616,7 @@@@
       if(MIME_MSG(part->body.type, part->body.subtype))
 	cnt++;
     
-    sprintf(nmsgs, "%d Msg Digest (part %s) ", cnt, a->number);
+    sprintf(nmsgs, "%d H Digest ( %s ) ", cnt, a->number);
 
     if(save_prompt(ps_global, &cntxt, newfolder, nmsgs, NULL, 0, NULL)){
 	save_folder = (strucmp(newfolder, ps_global->inbox_name) == 0)
@@@@ -1650,11 +1650,11 @@@@
 
 	if(rv == 1)
 	  q_status_message2(SM_ORDER, 0, 4,
-			    "Attached digest (part %s) saved to \"%s\"",
+			    "[ digest( %s ) s \"%s\"",
 			    a->number, 
 			    save_folder);
 	else if(rv == -1)
-	  cmd_cancelled("Attached digest Save");
+	  cmd_cancelled("sJ[ digest");
 	/* else whatever broke in save_fetch_append shoulda bitched */
 
 	if(our_stream)
@@@@ -1708,7 +1708,7 @@@@
     ATTACH_S *ap = a;
     STORE_S  *store;
     static ESCKEY_S opts[] = {
-	{ctrl('T'), 10, "^T", "To Files"},
+	{ctrl('T'), 10, "^T", "ɮצC"},
 	{-1, 0, NULL, NULL},
 	{-1, 0, NULL, NULL}};
 
@@@@ -1716,7 +1716,7 @@@@
 	opts[i].ch    =  ctrl('I');
 	opts[i].rval  = 11;
 	opts[i].name  = "TAB";
-	opts[i].label = "Complete";
+	opts[i].label = "";
     }
 
     filename[0] = full_filename[0] = '\0';
@@@@ -1729,12 +1729,12 @@@@
     if(rv < 0){
 	switch(rv){
 	  case -1:
-	    cmd_cancelled("Export");
+	    cmd_cancelled("ץXɮ");
 	    break;
 
 	  case -2:
 	    q_status_message1(SM_ORDER, 0, 2,
-			      "Can't export to file outside of %s",
+			      "LkNɮ׶ץX %s H~a",
 			      ps_global->VAR_OPER_DIR);
 	    break;
 	}
@@@@ -1748,17 +1748,17 @@@@
 	  q_status_message(SM_ORDER | SM_DING, 3, 4, err);
 	else
           q_status_message3(SM_ORDER, 0, 4,
-			    "Attached message (part %s) %s to \"%s\"",
+			    "( %s )%s \"%s\"",
 			    a->number, 
-			    over==0 ? "written"
-				    : over==1 ? "overwritten" : "appended",
+			    over==0 ? "gJ"
+				    : over==1 ? "л\\" : "[",
 			    full_filename);
 
 	so_give(&store);
     }
     else
       q_status_message2(SM_ORDER | SM_DING, 3, 4,
-			"Error opening file \"%s\" to export message: %s",
+			"Lk}ɮ \"%s\" HѶץXHG%s",
 			full_filename, error_description(errno));
 }
 
@@@@ -1781,7 +1781,7 @@@@
     ATTACH_S *ap;
     STORE_S  *store;
     static ESCKEY_S opts[] = {
-	{ctrl('T'), 10, "^T", "To Files"},
+	{ctrl('T'), 10, "^T", "ɮצC"},
 	{-1, 0, NULL, NULL},
 	{-1, 0, NULL, NULL}};
 
@@@@ -1789,7 +1789,7 @@@@
 	opts[i].ch    =  ctrl('I');
 	opts[i].rval  = 11;
 	opts[i].name  = "TAB";
-	opts[i].label = "Complete";
+	opts[i].label = "";
     }
 
     filename[0] = full_filename[0] = '\0';
@@@@ -1802,12 +1802,12 @@@@
     if(rv < 0){
 	switch(rv){
 	  case -1:
-	    cmd_cancelled("Export");
+	    cmd_cancelled("ץXɮ");
 	    break;
 
 	  case -2:
 	    q_status_message1(SM_ORDER, 0, 2,
-			      "Can't export to file outside of %s",
+			      "LkNɮ׶ץX %s H~a",
 			      ps_global->VAR_OPER_DIR);
 	    break;
 	}
@@@@ -1829,7 +1829,7 @@@@
 		    sprintf(tmp_20k_buf, "  [Unknown Message subtype: %s ]\n",
 			    ap->body->subtype);
 		    if(!so_puts(store, tmp_20k_buf))
-		      err = "Can't write export file";
+		      err = "LkgJץX";
 		}
 		else{
 		    count++;
@@@@ -1838,29 +1838,29 @@@@
 		}
 	    }
 	    else if(!so_puts(store, "Unknown type in Digest"))
-	      err = "Can't write export file";
+	      err = "LkgJץX";
 	}
 
 	so_give(&store);
 
 	if(err){
 	    q_status_message1(SM_ORDER | SM_DING, 3, 3,
-			      "Error exporting: %s", err);
+			      "ץXɮ׮ɵoͿ~G%s", err);
 	    q_status_message1(SM_ORDER | SM_DING, 3, 3,
-			    "%s messages exported before error occurred", err);
+			    "%s ʫHb~ͤeQץX", err);
 	}
 	else
           q_status_message4(SM_ORDER, 0, 4,
-			"%s messages in digest (part %s) %s to \"%s\"",
+			"@@ %s ʫH( %s )%s \"%s\"",
 			    long2string(count),
 			    a->number, 
-			    over==0 ? "written"
-				    : over==1 ? "overwritten" : "appended",
+			    over==0 ? "QgJ"
+				    : over==1 ? "Qл\\" : "Q[",
 			    full_filename);
     }
     else
       q_status_message2(SM_ORDER | SM_DING, 3, 4,
-			"Error opening file \"%s\" to export digest: %s",
+			"Lk}ɮ \"%s\" HѶץX digestG%s",
 			full_filename, error_description(errno));
 }
 
@@@@ -1929,7 +1929,7 @@@@
 
 
     q_status_message2(SM_ORDER | SM_DING, 3, 3,
-		      "Error printing message %s, part %s",
+		      "LkCL %s ʫH󪺲 %s ",
 		      long2string(msgno), a->number);
     return(0);
 }
@@@@ -2010,14 +2010,14 @@@@
         /*----- Can't display this type ------*/
 	if(a->body->encoding < ENCOTHER)
 	  q_status_message4(SM_ORDER | SM_DING, 3, 5,
-		     "Don't know how to display %s%s%s attachments.%s",
+		     "p %s%s%s C%s",
 			    body_type_names(a->body->type),
 			    a->body->subtype ? "/" : "",
 			    a->body->subtype ? a->body->subtype :"",
-			    (flags & DA_SAVE) ? " Try Save." : "");
+			    (flags & DA_SAVE) ? " ոզsɡC" : "");
 	else
 	  q_status_message1(SM_ORDER | SM_DING, 3, 5,
-			    "Don't know how to unpack \"%s\" encoding",
+			    "pѶ} \"%s\" sX",
 			    body_encodings[(a->body->encoding <= ENCMAX)
 					     ? a->body->encoding : ENCOTHER]);
 
@@@@ -2239,7 +2239,7 @@@@
     clear_index_cache_ent(msgno);
 
     if(store = format_text_att(msgno, a, &handles)){
-	scroll_attachment("ATTACHED TEXT", store, CharStar, handles, a, flags);
+	scroll_attachment("r", store, CharStar, handles, a, flags);
 	free_handles(&handles);
 	so_give(&store);	/* free resources associated with store */
     }
@@@@ -2407,22 +2407,22 @@@@
     memset(&sargs, 0, sizeof(SCROLL_S));
     sargs.text.text    = so_text(store);
     sargs.text.src     = src;
-    sargs.text.desc    = "attachment";
+    sargs.text.desc    = "";
     sargs.text.handles = handles;
     sargs.bar.title    = title;
     sargs.proc.tool    = process_attachment_cmd;
     sargs.proc.data.p  = (void *) a;
     sargs.help.text    = h_mail_text_att_view;
-    sargs.help.title   = "HELP FOR ATTACHED TEXT VIEW";
+    sargs.help.title   = "˵rU";
     sargs.keys.menu    = &att_view_keymenu;
     setbitmap(sargs.keys.bitmap);
 
     /* First, fix up "back" key */
     if(flags & DA_FROM_VIEW){
-	att_view_keymenu.keys[ATV_BACK_KEY].label = "MsgText";
+	att_view_keymenu.keys[ATV_BACK_KEY].label = "Hr";
     }
     else{
-	att_view_keymenu.keys[ATV_BACK_KEY].label = "AttchIndex";
+	att_view_keymenu.keys[ATV_BACK_KEY].label = "";
     }
 
     if(!handles){
@@@@ -2854,9 +2854,9 @@@@
     sargs.text.text  = so_text(store);
     sargs.text.src   = CharStar;
     sargs.text.desc  = "attachment info";
-    sargs.bar.title  = "ABOUT ATTACHMENT";
+    sargs.bar.title  = "T";
     sargs.help.text  = h_simple_text_view;
-    sargs.help.title = "HELP FOR \"ABOUT ATTACHMENT\"";
+    sargs.help.title = "\"\"U";
 
     scrolltool(&sargs);
 
@@@@ -2900,7 +2900,7 @@@@
 	      role = combine_inherited_role(role);
 	    else{
 		role = NULL;
-		cmd_cancelled("Forward");
+		cmd_cancelled("H");
 		mail_free_envelope(&outgoing);
 		return;
 	    }
@@@@ -2971,7 +2971,7 @@@@
 		else		/* partially formatted outgoing message */
 		  pine_send(outgoing, &body,
 			    ps_global->nr_mode
-			      ? "SEND MESSAGE" : "FORWARD MESSAGE",
+			      ? "eXH" : "HH",
 			    role, NULL, NULL, redraft_pos, NULL, NULL, FALSE);
 
 		ps_global->mangled_screen = 1;
@@@@ -2989,12 +2989,12 @@@@
 		so_give((STORE_S **) &msgtext);
 		free_redraft_pos(&redraft_pos);
 		q_status_message(SM_ORDER | SM_DING, 4, 5,
-		   "Error fetching message contents.  Can't forward message.");
+		   "oH󤺮eɵoͿ~CLkHHC");
 	    }
 	}
 	else
 	  q_status_message(SM_ORDER | SM_DING, 3, 4,
-			   "Error allocating message text");
+			   "LktmHr");
 
 	mail_free_envelope(&outgoing);
 	free_action(&role);
@@@@ -3032,7 +3032,7 @@@@
 
 	    ret = 'n';
 	    if(ps_global->full_header)
-	       ret = want_to("Forward message as an attachment", 'n', 0,
+	       ret = want_to("NHHΦH", 'n', 0,
 			     NO_HELP, WT_SEQ_SENSITIVE);
 	    /* Setup possible role */
 	    if(!ps_global->anonymous && nonempty_patterns()){
@@@@ -3042,7 +3042,7 @@@@
 		  role = combine_inherited_role(role);
 		else{				/* cancel reply */
 		    role = NULL;
-		    cmd_cancelled("Forward");
+		    cmd_cancelled("H");
 		    mail_free_envelope(&outgoing);
 		    so_give((STORE_S **) &msgtext);
 		    return;
@@@@ -3118,7 +3118,7 @@@@
 		  pine_simple_send(outgoing, &body, NULL, NULL, NULL, 1);
 		else		/* partially formatted outgoing message */
 		  pine_send(outgoing, &body,
-		      ps_global->nr_mode ? "SEND MESSAGE" : "FORWARD MESSAGE",
+		      ps_global->nr_mode ? "eXH" : "HH",
 			    role, NULL, NULL, redraft_pos, NULL, NULL, FALSE);
 
 		ps_global->mangled_screen = 1;
@@@@ -3135,16 +3135,16 @@@@
 	    else{
 		so_give((STORE_S **) &msgtext);
 		q_status_message(SM_ORDER | SM_DING, 4, 5,
-		   "Error fetching message contents.  Can't forward message.");
+		   "oH󤺮eɵoͿ~CLkHHC");
 	    }
 	}
 	else
 	  q_status_message(SM_ORDER | SM_DING, 3, 4,
-			   "Error allocating message text");
+			   "LktmHr");
     }
     else
       q_status_message1(SM_ORDER,3,4,
-			"Error fetching message %s. Can't forward it.",
+			"oH %s eɵoͿ~CLkHC",
 			long2string(msgno));
 
     mail_free_envelope(&outgoing);
@@@@ -3206,7 +3206,7 @@@@
 	      role = combine_inherited_role(role);
 	    else{				/* cancel reply */
 		role = NULL;
-		cmd_cancelled("Reply");
+		cmd_cancelled("^");
 		goto seeyalater;
 	    }
 	}
@@@@ -3248,7 +3248,7 @@@@
 				    : ps_global->VAR_SIGNATURE_FILE,
 				 &redraft_pos)){
 		/* partially formatted outgoing message */
-		pine_send(outgoing, &body, "COMPOSE MESSAGE REPLY",
+		pine_send(outgoing, &body, "sH^",
 			  role, fcc.tptr, NULL, redraft_pos, NULL, NULL, 0);
 
 		pine_free_body(&body);
@@@@ -3256,13 +3256,13 @@@@
 	    }
 	    else
 	      q_status_message(SM_ORDER | SM_DING, 3, 4,
-			       "Error building message body");
+			       "Lkإ߫H");
 
 	    fs_give((void **) &tp);
 	}
 	else
 	  q_status_message(SM_ORDER | SM_DING, 3, 4,
-			   "Error allocating message text");
+			   "LktmHr");
     }
 
 seeyalater:
@@@@ -3332,7 +3332,7 @@@@
 
 	sprintf(prompt, "Pipe %sattachment %s to %s: ", raw ? "RAW " : "",
 		a->number, capture ? "" : "(Free Output) ");
-	pipe_opt[1].label = raw ? "DecodedData" : "Raw Data";
+	pipe_opt[1].label = raw ? "ѽX᪺" : "l";
 	pipe_opt[2].label = capture ? "Free Output" : "Capture Output";
 	flags = OE_APPEND_CURRENT | OE_SEQ_SENSITIVE;
 	rc = optionally_enter(pipe_command, -FOOTER_ROWS(ps_global), 0,
@@@@ -3350,7 +3350,7 @@@@
 	}
 	else if(rc == 0){
 	    if(pipe_command[0] == '\0'){
-		cmd_cancelled("Pipe command");
+		cmd_cancelled("ɦVRO");
 		break;
 	    }
 
@@@@ -3428,7 +3428,7 @@@@
 	    break;
 	}
 	else if(rc == 1){
-	    cmd_cancelled("Pipe");
+	    cmd_cancelled("ɦV");
 	    break;
 	}
 	else if(rc = 3)
@


1.8
log
@Update to version 4.20.

PR:		14575
Submitted by:	maintainer
@
text
@@


1.7
log
@Update to version 4.10.

PR:		10245
Submitted by:	maintainer
@
text
@d1 2
a2 2
--- pine/mailpart.c.orig	Fri Feb  5 07:14:39 1999
+++ pine/mailpart.c	Tue Feb 23 15:32:33 1999
d61 1
a61 1
@@@@ -337,12 +337,12 @@@@
d76 1
a76 1
@@@@ -485,7 +485,7 @@@@
d85 1
a85 1
@@@@ -523,7 +523,7 @@@@
d94 1
a94 1
@@@@ -549,7 +549,7 @@@@
d103 1
a103 1
@@@@ -615,7 +615,7 @@@@
d112 1
a112 1
@@@@ -644,7 +644,7 @@@@
d121 1
a121 1
@@@@ -652,7 +652,7 @@@@
d130 1
a130 1
@@@@ -666,7 +666,7 @@@@
d139 1
a139 1
@@@@ -687,7 +687,7 @@@@
d148 1
a148 1
@@@@ -1149,7 +1149,7 @@@@
d157 1
a157 1
@@@@ -1317,7 +1317,7 @@@@
d166 1
a166 1
@@@@ -1346,7 +1346,7 @@@@
d175 1
a175 1
@@@@ -1354,7 +1354,7 @@@@
d184 1
a184 1
@@@@ -1388,7 +1388,7 @@@@
d193 1
a193 1
@@@@ -1396,7 +1396,7 @@@@
d202 1
a202 1
@@@@ -1405,7 +1405,7 @@@@
d211 1
a211 1
@@@@ -1422,18 +1422,18 @@@@
d233 1
a233 1
@@@@ -1445,12 +1445,12 @@@@
d248 1
a248 1
@@@@ -1469,7 +1469,7 @@@@
d257 1
a257 1
@@@@ -1547,7 +1547,7 @@@@
d266 1
a266 1
@@@@ -1569,11 +1569,11 @@@@
d280 1
a280 1
@@@@ -1615,7 +1615,7 @@@@
d289 1
a289 1
@@@@ -1649,11 +1649,11 @@@@
d303 1
a303 1
@@@@ -1707,7 +1707,7 @@@@
d312 1
a312 1
@@@@ -1715,7 +1715,7 @@@@
d321 1
a321 1
@@@@ -1728,12 +1728,12 @@@@
d336 1
a336 1
@@@@ -1747,17 +1747,17 @@@@
d358 1
a358 1
@@@@ -1780,7 +1780,7 @@@@
d367 1
a367 1
@@@@ -1788,7 +1788,7 @@@@
d376 1
a376 1
@@@@ -1801,12 +1801,12 @@@@
d391 1
a391 1
@@@@ -1828,7 +1828,7 @@@@
d400 1
a400 1
@@@@ -1837,29 +1837,29 @@@@
d437 1
a437 1
@@@@ -1928,7 +1928,7 @@@@
d446 1
a446 1
@@@@ -2009,14 +2009,14 @@@@
d464 1
a464 1
@@@@ -2238,7 +2238,7 @@@@
d473 1
a473 1
@@@@ -2406,22 +2406,22 @@@@
d500 1
a500 1
@@@@ -2853,9 +2853,9 @@@@
d512 10
a521 1
@@@@ -2970,7 +2970,7 @@@@
d530 1
a530 1
@@@@ -2988,12 +2988,12 @@@@
d544 1
a544 1
 	free_role(&role);
d553 3
a555 2
 	    if(!ps_global->anonymous && (pattern_h = open_nonempty_patterns())){
@@@@ -3043,7 +3043,7 @@@@
a557 1
 		    close_patterns(&pattern_h);
d563 1
a563 1
@@@@ -3121,7 +3121,7 @@@@
d572 1
a572 1
@@@@ -3138,16 +3138,16 @@@@
d592 10
a601 1
@@@@ -3256,7 +3256,7 @@@@
d610 1
a610 1
@@@@ -3264,13 +3264,13 @@@@
d626 1
a626 1
@@@@ -3340,7 +3340,7 @@@@
d635 1
a635 1
@@@@ -3358,7 +3358,7 @@@@
d644 1
a644 1
@@@@ -3436,7 +3436,7 @@@@
@


1.6
log
@Update to version 4.05.

PR:		8025
Submitted by:	maintainer
@
text
@d1 2
a2 2
--- pine/mailpart.c.orig	Wed Sep 16 04:00:39 1998
+++ pine/mailpart.c	Tue Sep 22 20:29:13 1998
d65 1
a65 1
-			 "Can only view one message's attachments at a time!");
d72 1
a72 1
+	"H %s Ȧ@@(H)ASC",
d157 1
a157 1
@@@@ -1318,7 +1318,7 @@@@
d166 1
a166 1
@@@@ -1351,7 +1351,7 @@@@
d175 1
a175 1
@@@@ -1359,7 +1359,7 @@@@
d184 1
a184 1
@@@@ -1393,7 +1393,7 @@@@
d193 1
a193 1
@@@@ -1401,7 +1401,7 @@@@
d202 1
a202 1
@@@@ -1410,7 +1410,7 @@@@
d211 1
a211 1
@@@@ -1427,18 +1427,18 @@@@
d233 1
a233 1
@@@@ -1450,12 +1450,12 @@@@
d248 1
a248 1
@@@@ -1474,7 +1474,7 @@@@
d257 1
a257 1
@@@@ -1552,7 +1552,7 @@@@
d266 1
a266 1
@@@@ -1574,11 +1574,11 @@@@
d280 1
a280 1
@@@@ -1620,7 +1620,7 @@@@
d289 1
a289 1
@@@@ -1654,11 +1654,11 @@@@
d303 1
a303 1
@@@@ -1712,7 +1712,7 @@@@
d312 1
a312 1
@@@@ -1720,7 +1720,7 @@@@
d321 1
a321 1
@@@@ -1733,12 +1733,12 @@@@
d336 1
a336 1
@@@@ -1752,17 +1752,17 @@@@
d358 1
a358 1
@@@@ -1785,7 +1785,7 @@@@
d367 1
a367 1
@@@@ -1793,7 +1793,7 @@@@
d376 1
a376 1
@@@@ -1806,12 +1806,12 @@@@
d391 1
a391 1
@@@@ -1833,7 +1833,7 @@@@
d400 1
a400 1
@@@@ -1842,29 +1842,29 @@@@
d437 1
a437 1
@@@@ -1933,7 +1933,7 @@@@
d446 1
a446 1
@@@@ -2014,14 +2014,14 @@@@
d464 1
a464 1
@@@@ -2243,7 +2243,7 @@@@
d473 1
a473 1
@@@@ -2411,22 +2411,22 @@@@
d500 1
a500 1
@@@@ -2858,9 +2858,9 @@@@
d512 1
a512 1
@@@@ -2922,7 +2922,7 @@@@
d518 1
a518 1
 			    NULL, NULL, NULL, NULL, NULL, FALSE);
d521 1
a521 2
@@@@ -2938,12 +2938,12 @@@@
 		mail_free_body(&body);
d523 1
d535 20
a554 2
     }
@@@@ -3008,7 +3008,7 @@@@
d560 1
a560 1
 			    NULL, NULL, NULL, NULL, NULL, FALSE);
d563 1
a563 1
@@@@ -3023,16 +3023,16 @@@@
d583 3
a585 3
@@@@ -3105,7 +3105,7 @@@@
 				 tp = body_partno(stream, msgno, a->body),
 				 msgtext, prefix, include_text)){
d589 1
a589 1
 			  fcc.tptr, NULL, NULL, NULL, NULL, 0);
d592 1
a592 1
@@@@ -3113,13 +3113,13 @@@@
d608 1
a608 1
@@@@ -3186,7 +3186,7 @@@@
d617 1
a617 1
@@@@ -3204,7 +3204,7 @@@@
d626 1
a626 1
@@@@ -3278,7 +3278,7 @@@@
@


1.5
log
@Update to version 4.0a2.

PR:		7672
Submitted by:	maintainer
@
text
@d1 3
a3 3
--- pine/mailpart.c.orig	Wed Aug 19 10:37:25 1998
+++ pine/mailpart.c	Wed Aug 19 10:45:24 1998
@@@@ -134,18 +134,18 @@@@
d26 1
a26 1
@@@@ -154,9 +154,9 @@@@
d38 1
a38 2
@@@@ -173,11 +173,11 @@@@
 static struct key att_view_keys[] =
d41 1
a41 1
-	{"<",NULL,{MC_EXIT,2,{'<',','}},KS_EXITMODE},
a42 1
+	{"<",NULL,{MC_EXIT,3,{'<',',',KEY_LEFT}},KS_EXITMODE},
d52 1
a52 1
@@@@ -193,7 +193,7 @@@@
d61 1
a61 1
@@@@ -323,12 +323,12 @@@@
d69 1
a69 2
-    else if(ps->atmts && ps->atmts->description && !(ps->atmts + 1)->description)
+    else if(ps->atmts && !(ps->atmts + 1)->description)
d76 1
a76 1
@@@@ -471,7 +471,7 @@@@
d85 10
a94 1
@@@@ -535,7 +535,7 @@@@
d103 10
a112 1
@@@@ -630,7 +630,7 @@@@
d121 1
a121 1
@@@@ -638,7 +638,7 @@@@
d130 1
a130 1
@@@@ -652,7 +652,7 @@@@
d139 1
a139 1
@@@@ -673,7 +673,7 @@@@
d148 1
a148 1
@@@@ -1041,7 +1041,7 @@@@
d157 1
a157 1
@@@@ -1210,7 +1210,7 @@@@
d166 1
a166 1
@@@@ -1243,7 +1243,7 @@@@
d175 1
a175 1
@@@@ -1251,7 +1251,7 @@@@
d184 88
a271 1
@@@@ -1470,7 +1470,7 @@@@
d280 10
a289 1
@@@@ -1546,11 +1546,11 @@@@
d303 1
a303 1
@@@@ -1604,7 +1604,7 @@@@
d312 1
a312 1
@@@@ -1612,7 +1612,7 @@@@
d321 1
a321 1
@@@@ -1625,7 +1625,7 @@@@
d330 29
a358 1
@@@@ -1677,7 +1677,7 @@@@
d367 1
a367 1
@@@@ -1685,7 +1685,7 @@@@
d376 1
a376 1
@@@@ -1698,7 +1698,7 @@@@
d385 62
a446 1
@@@@ -1906,14 +1906,14 @@@@
d464 6
a469 6
@@@@ -2102,7 +2102,7 @@@@
 	gf_set_so_writec(&pc, store);
 	(void) decode_text(a, msgno, pc, QStatus, FM_DISPLAY | FM_HANDLES);
 	gf_clear_so_writec(store);
-	scroll_attachment("ATTACHED TEXT", store, src, handles, a, flags);
+	scroll_attachment("r", store, src, handles, a, flags);
d473 1
a473 1
@@@@ -2277,22 +2277,22 @@@@
d500 1
a500 2
@@@@ -2706,10 +2706,10 @@@@
     memset(&sargs, 0, sizeof(SCROLL_S));
d503 1
a503 1
-    sargs.text.desc  = "attachment info";
d505 1
a505 2
+    sargs.text.desc  = "T";
+    sargs.bar.title  = "";
d512 1
a512 1
@@@@ -2771,7 +2771,7 @@@@
d521 16
a536 1
@@@@ -2857,7 +2857,7 @@@@
d545 21
a565 1
@@@@ -2954,7 +2954,7 @@@@
d574 17
a590 1
@@@@ -3035,7 +3035,7 @@@@
d599 1
a599 1
@@@@ -3053,7 +3053,7 @@@@
d608 1
a608 1
@@@@ -3127,7 +3127,7 @@@@
@


1.4
log
@Cleanups from maintainer.

PR:		7468
Submitted by:	maintainer
@
text
@d1 2
a2 2
--- pine/mailpart.c.orig	Tue Jul 21 03:18:49 1998
+++ pine/mailpart.c	Tue Aug  4 12:42:18 1998
d151 1
a151 1
@@@@ -1242,7 +1242,7 @@@@
d160 1
a160 1
@@@@ -1250,7 +1250,7 @@@@
d169 1
a169 1
@@@@ -1469,7 +1469,7 @@@@
d178 1
a178 1
@@@@ -1545,11 +1545,11 @@@@
d192 1
a192 1
@@@@ -1603,7 +1603,7 @@@@
d201 1
a201 1
@@@@ -1611,7 +1611,7 @@@@
d210 1
a210 1
@@@@ -1624,7 +1624,7 @@@@
d219 1
a219 1
@@@@ -1676,7 +1676,7 @@@@
d228 1
a228 1
@@@@ -1684,7 +1684,7 @@@@
d237 1
a237 1
@@@@ -1697,7 +1697,7 @@@@
d246 1
a246 1
@@@@ -1905,14 +1905,14 @@@@
d264 1
a264 1
@@@@ -2101,7 +2101,7 @@@@
d273 1
a273 1
@@@@ -2276,22 +2276,22 @@@@
d300 1
a300 1
@@@@ -2705,10 +2705,10 @@@@
d314 1
a314 1
@@@@ -2770,7 +2770,7 @@@@
d323 1
a323 1
@@@@ -2856,7 +2856,7 @@@@
d332 1
a332 1
@@@@ -2953,7 +2953,7 @@@@
d341 1
a341 1
@@@@ -3034,7 +3034,7 @@@@
d350 1
a350 1
@@@@ -3052,7 +3052,7 @@@@
d359 1
a359 1
@@@@ -3126,7 +3126,7 @@@@
@


1.3
log
@Upgrade to 4.02,
Submitted by:	maintainer
@
text
@d1 350
a350 58
--- pine/newmail.c.orig	Fri Mar 27 07:28:33 1998
+++ pine/newmail.c	Tue Jul 28 08:35:04 1998
@@@@ -289,38 +289,28 @@@@
     ENVELOPE	*e;
     char	 subject[200], from[2*MAX_SCREEN_COLS],
 		 intro[MAX_SCREEN_COLS+1];
-    static char *carray[] = { "regarding",
-				"concerning",
-				"about",
-				"as to",
-				"as regards",
-				"as respects",
-				"in re",
-				"re",
-				"respecting",
-				"in point of",
-				"with regard to",
-				"subject:"
+    static char *carray[] = { "",
+				""
     };
 
     e = mail_fetchstructure(stream, max_num, NULL);
 
     if(!folder) {
         if(number > 1)
-          sprintf(intro, "%ld new messages!", number);
+          sprintf(intro, "%ld ʷsHI", number);
         else
-	  sprintf(intro, "New mail%s!",
-		  (e && address_is_us(e->to, ps_global)) ? " to you" : "");
+	  sprintf(intro, "%ssHI",
+		  (e && address_is_us(e->to, ps_global)) ? "z" : "");
     }
     else {
         if(number > 1)
-          sprintf(intro,"%ld messages saved to folder \"%s\"", number, folder);
+          sprintf(intro,"%ld ʫHQsܸƧX \"%s\"", number, folder);
         else
-          sprintf(intro, "Mail saved to folder \"%s\"", folder);
+          sprintf(intro, "HQsܸƧX \"%s\"", folder);
     }
 
     if(e && e->from){
-	sprintf(from, " %srom ", (number > 1L) ? "Most recent f" : "F");
+	sprintf(from, "%s", (number > 1L) ? "̪" : "");
 	if(e->from->personal)
 	  istrncpy(from + ((number > 1L) ? 18 : 6),
 		   (char *) rfc1522_decode((unsigned char *) tmp_20k_buf,
@@@@ -337,13 +327,13 @@@@
 
     if(number <= 1L) {
         if(e && e->subject){
-	    sprintf(subject, " %s ", carray[(unsigned)random()%12]);
+	    sprintf(subject, " %s ", carray[(unsigned)random()%2]);
 	    istrncpy(subject + strlen(subject),
 		     (char *) rfc1522_decode((unsigned char *) tmp_20k_buf,
 					     e->subject, NULL), 100);
d352 6
a357 3
 	else
-	  strcpy(subject, " with no subject");
+	  strcpy(subject, " SDD");
d359 9
a367 2
         if(!from[0])
           subject[1] = toupper((unsigned char)subject[1]);
@


1.2
log
@Upgrade to 4.00
Submitted by:	Liang Tai-hwa <avatar@@www.mmlab.cse.yzu.edu.tw>
@
text
@d1 58
a58 75
--- pine/screen.c.orig	Fri Jun  5 04:09:17 1998
+++ pine/screen.c	Wed Jul 15 17:02:37 1998
@@@@ -433,7 +433,7 @@@@
 
 
 static struct key cancel_keys[] = 
-     {{NULL,NULL,KS_NONE},            {"^C","Cancel",KS_NONE},
+     {{NULL,NULL,KS_NONE},            {"^C","",KS_NONE},
       {NULL,NULL,KS_NONE},            {NULL,NULL,KS_NONE},
       {NULL,NULL,KS_NONE},            {NULL,NULL,KS_NONE},
       {NULL,NULL,KS_NONE},            {NULL,NULL,KS_NONE},
@@@@ -1124,10 +1124,10 @@@@
     as.page_column    = -1;
     is_context        = strlen(as.context_name);
     sprintf(version, "PINE %s", pine_version); 
-    ss_string         = as.stream_status == Closed ? "(CLOSED)" :
+    ss_string         = as.stream_status == Closed ? "(w)" :
                         (as.stream_status == ReadOnly
 			 && !IS_NEWS(as.stream))
-                           ? "(READONLY)" : "";
+                           ? "(Ū)" : "";
     ss_len            = strlen(ss_string);
 
     tit_len = strlen(as.title);		/* fixed title field width   */
@@@@ -1144,17 +1144,17 @@@@
     /* 
      * set location field's length and value based on requested style 
      */
-    loc_label = (is_context) ? "Msg" : "Message";
+    loc_label = (is_context) ? "H" : "H";
     loc_len   = strlen(loc_label);
     if(!mn_get_total(as.msgmap)){
-	sprintf(tmp_20k_buf, "No %ss", loc_label);
+	sprintf(tmp_20k_buf, "S%s", loc_label);
 	loc_len += 4;
     }else{
 	switch(as.style){
 	  case FolderName :			/* "x,xxx <loc_label>s" */
 	    loc_len += digit_count(mn_get_total(as.msgmap)) + 3;
-	    sprintf(tmp_20k_buf, "%s %s%s", comatose(mn_get_total(as.msgmap)),
-		    loc_label, plural(mn_get_total(as.msgmap)));
+	    sprintf(tmp_20k_buf, "%s %s", comatose(mn_get_total(as.msgmap)),
+		    loc_label);
 	    break;
 	  case MessageNumber :	       	/* "<loc_label> xxx of xxx DEL"  */
 	    num_len	     = digit_count(mn_get_total(as.msgmap));
@@@@ -1162,7 +1162,7 @@@@
 	    as.cur_mess_col  = sc - (2 * num_len) - 10;
 	    as.del_column    = as.cur_mess_col + num_len 
 	      + digit_count(as.current_msg) + 5;
-	    sprintf(tmp_20k_buf, "%s %s of %s %s", loc_label,
+	    sprintf(tmp_20k_buf, "%s %s  %s %s", loc_label,
 		    strcpy(tmp_20k_buf + 1000, comatose(as.current_msg)),
 		    strcpy(tmp_20k_buf + 1500, comatose(mn_get_total(as.msgmap))),
 		    BAR_STATUS(as.msg_state));
@@@@ -1174,7 +1174,7 @@@@
 	    as.percent_column  = as.cur_mess_col + num_len
 	      + digit_count(as.current_msg) + 7;
 	    as.del_column      = as.percent_column + 4;
-	    sprintf(tmp_20k_buf, "%s %s of %s %s %s", loc_label, 
+	    sprintf(tmp_20k_buf, "%s %s  %s %s %s", loc_label, 
 		    strcpy(tmp_20k_buf + 1000, comatose(as.current_msg)),
 		    strcpy(tmp_20k_buf + 1500, comatose(mn_get_total(as.msgmap))),
 		    percentage(as.current_line, as.total_lines, 1),
@@@@ -1185,7 +1185,7 @@@@
 	  case FileTextPercent :
 	    as.page_column = sc - (14 + 2*(num_len = digit_count(as.total_lines)));
 	    loc_len        = 17 + 2*num_len;
-	    sprintf(tmp_20k_buf, "Line %*ld of %*ld %s    ",
+	    sprintf(tmp_20k_buf, " %*ld  %*ld %s    ",
 		    num_len, as.current_line, 
 		    num_len, as.total_lines,
 		    percentage(as.current_line, as.total_lines, 1));
@@@@ -1259,7 +1259,7 @@@@
 		      ss_string);
d60 3
a62 27
 	else{
-	    char *fmt = "Folder: %s%s";
+	    char *fmt = "HXG%s%s";
 	    if(fold_len + ss_len + 8 < avail) 	/* all of folder fit? */
 	      sprintf(fold_tmp, fmt, as.folder_name, ss_string);
 	    else if((fold_len/2) + ss_len + 8 < avail)
@@@@ -1307,7 +1307,7 @@@@
 	as.current_msg = mn_get_cur(as.msgmap);
 
         if(as.style == MsgTextPercent){
-            PutLine5(0, as.cur_mess_col, "%s of %s %s %s%s",
+            PutLine5(0, as.cur_mess_col, "%s  %s %s %s%s",
 		     strcpy(tmp_20k_buf + 1000, comatose(as.current_msg)),
 		     strcpy(tmp_20k_buf + 1500,
 			    comatose(mn_get_total(as.msgmap))),
@@@@ -1317,7 +1317,7 @@@@
 	    as.del_column     += delta;
 	    as.percent_column += delta;
         } else {
-            PutLine4(0, as.cur_mess_col, "%s of %s %s%s",
+            PutLine4(0, as.cur_mess_col, "%s  %s %s%s",
 		     strcpy(tmp_20k_buf + 1000, comatose(as.current_msg)),
 		     strcpy(tmp_20k_buf + 1500,
 			    comatose(mn_get_total(as.msgmap))),
@@@@ -1420,7 +1420,7 @@@@
 
     as.current_line = new_line_number;
d64 2
a65 5
-    sprintf(tmp_20k_buf, "%*ld of %*ld %s    ",
+    sprintf(tmp_20k_buf, "%*ld  %*ld %s    ",
 	    digit_count(as.total_lines), as.current_line, 
 	    digit_count(as.total_lines), as.total_lines,
 	    percentage(as.current_line, as.total_lines, 0));
@


1.1
log
@Add a lot of patches of chinese menu.
Submitted by:	maintainer
@
text
@d1 43
a43 56
--- pine/mailpart.c.orig	Thu May 30 05:47:17 1996
+++ pine/mailpart.c	Sat Jan 17 21:06:54 1998
@@@@ -74,12 +74,12 @@@@
 
 
 static struct key att_index_keys[] = 
-       {{"?","Help",KS_SCREENHELP},	{NULL,NULL,KS_NONE},
-	{"E","Exit Index",KS_EXITMODE},	{"V","[View]",KS_VIEW},
-	{"P","PrevAttch",KS_NONE},	{"N","NextAttch",KS_NONE},
-	{"-","PrevPage",KS_PREVPAGE},	{"Spc","NextPage",KS_NEXTPAGE},
-	{"A","AboutAttch",KS_NONE},	{"S","Save",KS_SAVE},
-	{"|","Pipe",KS_NONE},		{"W","WhereIs",KS_WHEREIS}};
+       {{"?","U",KS_SCREENHELP},	{NULL,NULL,KS_NONE},
+	{"E","}",KS_EXITMODE},	{"V","[˵]",KS_VIEW},
+	{"P","e@@",KS_NONE},	{"N","@@",KS_NONE},
+	{"-","W@@",KS_PREVPAGE},	{"Spc","U@@",KS_NEXTPAGE},
+	{"A","",KS_NONE},	{"S","xs",KS_SAVE},
+	{"|","Pipe",KS_NONE},		{"W","jM",KS_WHEREIS}};
 INST_KEY_MENU(att_index_keymenu, att_index_keys);
 #define	ATT_PIPE_KEY	10
 
@@@@ -354,6 +354,7 @@@@
 	    ps->mangled_screen = 1;
 	    break;
 
+	  case KEY_LEFT :
 	  case 'e' :				/* exit attachment screen */
 	  case PF3 :
 	    done++;
@@@@ -362,7 +363,6 @@@@
 	  case 'n' :				/* next list element */
 	  case '\t' :
 	  case ctrl('F') :
-	  case KEY_RIGHT :
 	  case ctrl('N'):			/* down arrow */
 	  case KEY_DOWN :
 	  case PF6 :
@@@@ -377,7 +377,6 @@@@
 
 	  case 'p' :				/* previous list element */
 	  case ctrl('B') :
-	  case KEY_LEFT :
 	  case ctrl('P') :			/* up arrow */
 	  case KEY_UP :
 	  case PF5 :
@@@@ -506,7 +505,7 @@@@
 		 }
 	     }
 	     else
-	       result = "WhereIs cancelled";
+	       result = "jMOw";
 
 	     if(found && ctmp){
 		 strcpy(last, buf);
@@@@ -530,6 +529,7 @@@@
 	    ps->mangled_screen = 1;
d45 65
a109 14
 
+	  case KEY_RIGHT:
 	  case 'v':				/* View command */
 	  case ctrl('M'):
 	  case PF4 :
@@@@ -855,7 +855,7 @@@@
     char       *err;
     struct variable *vars = ps_global->vars;
     static ESCKEY_S att_save_opts[] = {
-	{ctrl('T'), 10, "^T", "To Files"},
+	{ctrl('T'), 10, "^T", "HC"},
 	{-1, 0, NULL, NULL},
 	{-1, 0, NULL, NULL},
 	{-1, 0, NULL, NULL}};
@
