freebsd-ports/chinese/pine4/files/patch-aj

--- pico/composer.c.orig	Wed Aug 19 10:37:25 1998
+++ pico/composer.c	Wed Aug 19 10:45:17 1998
@@ -136,12 +136,12 @@
 
 
 static KEYMENU menu_header[] = {
-    {"^G", "Get Help", KS_SCREENHELP},	{"^X", "Send", KS_SEND},
-    {"^R", "Rich Hdr", KS_RICHHDR},	{"^Y", "PrvPg/Top", KS_PREVPAGE},
-    {"^K", "Cut Line", KS_CURPOSITION},	{"^O", "Postpone", KS_POSTPONE},
-    {"^C", "Cancel", KS_CANCEL},	{"^D", "Del Char", KS_NONE},
-    {"^J", "Attach", KS_ATTACH},	{"^V", "NxtPg/End", KS_NEXTPAGE},
-    {"^U", "UnDel Line", KS_NONE},	{NULL, NULL}
+    {"^G", "<22><><EFBFBD>U<EFBFBD><55><EFBFBD><EFBFBD>", KS_SCREENHELP},	{"^X", "<22>e<EFBFBD>X", KS_SEND},
+    {"^R", "<22><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>Y", KS_RICHHDR},	{"^Y", "<22>W<EFBFBD>@<40><>", KS_PREVPAGE},
+    {"^K", "<22>ŤU<C5A4>@<40><>", KS_CURPOSITION},	{"^O", "<22>Ƚw<C8BD>g<EFBFBD>H", KS_POSTPONE},
+    {"^C", "<22><><EFBFBD><EFBFBD>", KS_CANCEL},	{"^D", "<22>R<EFBFBD><52><EFBFBD>r<EFBFBD><72>", KS_NONE},
+    {"^J", "<22><><EFBFBD><EFBFBD><EFBFBD><EFBFBD>", KS_ATTACH},	{"^V", "<22>U<EFBFBD>@<40><>", KS_NEXTPAGE},
+    {"^U", "<22>_<EFBFBD><5F><EFBFBD>R<EFBFBD><52><EFBFBD><EFBFBD>", KS_NONE},	{NULL, NULL}
 };
 #define	SEND_KEY	1
 #define	RICH_KEY	2
@@ -245,7 +245,7 @@
 		     if(strlen(addrbuf) + strlen(buf) >= addrbuflen){
 			 addrbuflen += NLINE * 4;
 			 if(!(addrbuf = (char *)realloc(addrbuf, addrbuflen))){
-			     emlwrite("\007Can't realloc addrbuf to %d bytes",
+			     emlwrite("\007<30>L<EFBFBD>k<EFBFBD><6B><EFBFBD><EFBFBD> addrbuf <20><><EFBFBD>O<EFBFBD><4F><EFBFBD><EFBFBD><EFBFBD>t<EFBFBD>m<EFBFBD><6D> %d bytes",
 				      (void *) addrbuflen);
 			     return(ABORT);
 			 }
@@ -312,7 +312,7 @@
      * get first chunk of memory, and tie it to structure...
      */
     if((curline = HALLOC()) == NULL){
-        emlwrite("Unable to make room for full Header.", NULL);
+        emlwrite("<22>L<EFBFBD>k<EFBFBD>t<EFBFBD>m<EFBFBD>Ŷ<EFBFBD><C5B6><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>Y<EFBFBD>C", NULL);
         return(FALSE);
     }
     longest = term.t_ncol - e->prlen - 1;
@@ -694,7 +694,7 @@
 	    }
 	    else{
 		(*term.t_beep)();
-		emlwrite("Unknown Command: ^Z", NULL);
+		emlwrite("<22><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>R<EFBFBD>O<EFBFBD>G^Z", NULL);
 	    }
 	    break;
 
@@ -707,12 +707,12 @@
 	    err = NULL;
 	    if(headents[ods.cur_e].is_attach){
 		if(SyncAttach() < 0){
-		    if(mlyesno("Problem with attachments. Postpone anyway?",
+		    if(mlyesno("<22><><EFBFBD>󦳰<EFBFBD><F3A6B3B0>D<EFBFBD>C<EFBFBD>L<EFBFBD>צp<D7A6>󳣭n<F3B3A3AD>Ƚw<C8BD>ӫH<D3AB>ܡH",
 			       FALSE) != TRUE){
 			if(FormatLines(headents[ods.cur_e].hd_text, "",
 				       term.t_ncol - headents[ods.cur_e].prlen,
 				       headents[ods.cur_e].break_on_comma, 0) == -1)
-			  emlwrite("\007Format lines failed!", NULL);
+			  emlwrite("\007<30><37><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>z<EFBFBD><7A><EFBFBD><EFBFBD>!", NULL);
 			UpdateHeader();
 			PaintHeader(COMPOSER_TOP_LINE, FALSE);
 			PaintBody(1);
@@ -966,7 +966,7 @@
 		    if(FormatLines(headents[ods.cur_e].hd_text, buf,
 				   term.t_ncol - headents[ods.cur_e].prlen,
 				   headents[ods.cur_e].break_on_comma,0)==-1){
-			emlwrite("\007Format lines failed!", NULL);
+			emlwrite("\007<30><37><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>z<EFBFBD><7A><EFBFBD><EFBFBD>!", NULL);
 		    }
 
 		    UpdateHeader();
@@ -1025,7 +1025,7 @@
                         if(FormatLines(ods.cur_l, bufp,
 				      (term.t_ncol-headents[ods.cur_e].prlen), 
                                       headents[ods.cur_e].break_on_comma, 0) == -1){
-                            emlwrite("Problem adding address to header !",
+                            emlwrite("<22>b<EFBFBD><62><EFBFBD>Y<EFBFBD>[<5B>J<EFBFBD>a<EFBFBD>}<7D>ɥX<C9A5>F<EFBFBD><46><EFBFBD>D!",
                                      NULL);
                             (*term.t_beep)();
                             break;
@@ -1106,10 +1106,10 @@
 	  default :				/* huh? */
 bleep:
 	    if(ch&CTRL)
-	      emlwrite("\007Unknown command: ^%c", (void *)(ch&0xff));
+	      emlwrite("\007<30><37><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>R<EFBFBD>O<EFBFBD>G^%c", (void *)(ch&0xff));
 	    else
 	  case BADESC:
-	      emlwrite("\007Unknown command", NULL);
+	      emlwrite("\007<30><37><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>R<EFBFBD>O", NULL);
 
 	  case NODATA:
 	    break;
@@ -1149,14 +1149,14 @@
 	if(gripe){
 	    char xx[81];
 
-	    strcpy(xx, "Can't move down. Use ^X to ");
+	    strcpy(xx, "<22>L<EFBFBD>k<EFBFBD>A<EFBFBD><41><EFBFBD>U<EFBFBD><55><EFBFBD>F<EFBFBD>C<EFBFBD>Х<EFBFBD> ^X ");
 	    strcat(xx, (Pmaster && Pmaster->exit_label)
 			    ? Pmaster->exit_label
 			    : (gmode & MDHDRONLY)
-			      ? "eXit/Save"
+			      ? "<22><><EFBFBD>}/<2F>e<EFBFBD>X"
 			      : (gmode & MDVIEW)
-				? "eXit"
-				: "Send");
+				? "<22><><EFBFBD>}"
+				: "<22>e<EFBFBD>X");
 	    strcat(xx, ".");
 	    emlwrite(xx, NULL);
 	}
@@ -1191,7 +1191,7 @@
 		if(FormatLines(headents[ods.cur_e].hd_text, "",
 			       term.t_ncol-headents[new_e].prlen,
 			       headents[ods.cur_e].break_on_comma, 0) == -1)
-		  emlwrite("\007Format lines failed!", NULL);
+		  emlwrite("\007<30><37><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>z<EFBFBD><7A><EFBFBD><EFBFBD>!", NULL);
 	    }
 	} else if(headents[ods.cur_e].builder) { /* expand addresses	    */
 	    int mangled = 0;
@@ -1262,8 +1262,8 @@
     if(!(new_l = prev_sel_hline(&new_e, ods.cur_l))){	/* all the way up! */
 	ods.p_line = COMPOSER_TOP_LINE;
 	if(gripe)
-	  emlwrite("Can't move beyond top of %s",
-	      (Pmaster->pine_flags & MDHDRONLY) ? "entry" : "header");
+	  emlwrite("<22>L<EFBFBD>k<EFBFBD><6B><EFBFBD><EFBFBD><EFBFBD>W<EFBFBD>X%s<><73><EFBFBD><EFBFBD><EFBFBD><EFBFBD>",
+	      (Pmaster->pine_flags & MDHDRONLY) ? "<22><><EFBFBD><EFBFBD>" : "<22><><EFBFBD>Y");
 
 	return(0);
     }
@@ -1292,7 +1292,7 @@
 		if(FormatLines(headents[ods.cur_e].hd_text, "",
 			       term.t_ncol - headents[ods.cur_e].prlen,
 			       headents[ods.cur_e].break_on_comma,0) == -1)
-		  emlwrite("\007Format lines failed!", NULL);
+		  emlwrite("\007<30><37><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>z<EFBFBD><7A><EFBFBD><EFBFBD>!", NULL);
 	    }
 	}
 	else if(headents[ods.cur_e].builder){
@@ -1371,7 +1371,7 @@
 	    lp = lp->next;
 	}
 	else{
-	    emlwrite("\007Can't allocate line for new attachment!", NULL);
+	    emlwrite("\007<30>L<EFBFBD>k<EFBFBD><6B><EFBFBD>s<EFBFBD><73><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>t<EFBFBD>m<EFBFBD>Ŷ<EFBFBD>!", NULL);
 	    return(0);
 	}
     }
@@ -1385,12 +1385,12 @@
     /* validate the new attachment, and reformat if needed */
     if(status = SyncAttach()){
 	if(status < 0)
-	  emlwrite("\007Problem attaching: %s", fn);
+	  emlwrite("\007<30><37><EFBFBD><EFBFBD><EFBFBD>D<EFBFBD><44><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>G%s", fn);
 
 	if(FormatLines(headents[a_e].hd_text, "",
 		       term.t_ncol - headents[a_e].prlen,
 		       headents[a_e].break_on_comma, 0) == -1){
-	    emlwrite("\007Format lines failed!", NULL);
+	    emlwrite("\007<30><37><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>z<EFBFBD><7A><EFBFBD><EFBFBD>!", NULL);
 	    return(0);
 	}
     }
@@ -1466,7 +1466,7 @@
 	
 	if (term.t_nrow < 6 && ch != NODATA){
 	    (*term.t_beep)();
-	    emlwrite("Please make the screen bigger.", NULL);
+	    emlwrite("<22>бN<D0B1>e<EFBFBD><65><EFBFBD>դj<D5A4>@<40>ǡC", NULL);
 	    continue;
 	}
 
@@ -1537,13 +1537,13 @@
 		if(headents[ods.cur_e].only_file_chars
 		   && !fallowc((unsigned char) ch)){
 		    /* no garbage in filenames */
-		    emlwrite("\007Can't have a '%c' in folder name",
+		    emlwrite("\007<30><37><EFBFBD>ƧX<C6A7><58><EFBFBD><EFBFBD><EFBFBD>঳ '%c' <20>o<EFBFBD>Ӧr<D3A6><72>",
 			     (void *) ch);
 		    continue;
 		}
 		else if(headents[ods.cur_e].is_attach
 			&& intag(strng,ods.p_off)){
-		    emlwrite("\007Can't edit attachment number!", NULL);
+		    emlwrite("\007<30>L<EFBFBD>k<EFBFBD>s<EFBFBD><73><EFBFBD><EFBFBD><EFBFBD>󪺥N<F3AABAA5>X!", NULL);
 		    continue;
 		}
 
@@ -1689,7 +1689,7 @@
 		    headents[ods.cur_e].dirty  = 1;
 		}
 		else
-		  emlwrite("Problem Unkilling text", NULL);
+		  emlwrite("<22><><EFBFBD><EFBFBD><EFBFBD>D<EFBFBD><44><EFBFBD>ϧR<CFA7><52><EFBFBD><EFBFBD><EFBFBD>r", NULL);
 		continue;
 
 	      case (CTRL|'F') :
@@ -1740,7 +1740,7 @@
 		  continue;
 
 		if(headents[ods.cur_e].is_attach && intag(strng, ods.p_off)){
-		    emlwrite("\007Can't edit attachment number!", NULL);
+		    emlwrite("\007<30>L<EFBFBD>k<EFBFBD>s<EFBFBD><73><EFBFBD><EFBFBD><EFBFBD>󪺥N<F3AABAA5>X!", NULL);
 		    continue;
 		}
 
@@ -1754,7 +1754,7 @@
 		}
 
 		if(headents[ods.cur_e].is_attach && intag(strng, ods.p_off-1)){
-		    emlwrite("\007Can't edit attachment number!", NULL);
+		    emlwrite("\007<30>L<EFBFBD>k<EFBFBD>s<EFBFBD><73><EFBFBD><EFBFBD><EFBFBD>󪺥N<F3AABAA5>X!", NULL);
 		    continue;
 		}
 
@@ -1965,7 +1965,7 @@
 
 	if(nlp == NULL){			/* no place to add below? */
 	    if((lp = HALLOC()) == NULL){
-		emlwrite("Can't allocate any more lines for header!", NULL);
+		emlwrite("<22>L<EFBFBD>k<EFBFBD>A<EFBFBD>t<EFBFBD>m<EFBFBD><6D><EFBFBD>h<EFBFBD><68><EFBFBD>Ŷ<EFBFBD><C5B6><EFBFBD><EFBFBD><EFBFBD><EFBFBD>Y!", NULL);
 		free(buf);
 		return(-1);
 	    }
@@ -2000,7 +2000,7 @@
 
 	    if(strlen(buf) && !nlp){
 		if((lp = HALLOC()) == NULL){
-		    emlwrite("Can't allocate any more lines for header!",NULL);
+		    emlwrite("<22>L<EFBFBD>k<EFBFBD>A<EFBFBD>t<EFBFBD>m<EFBFBD><6D><EFBFBD>h<EFBFBD><68><EFBFBD>Ŷ<EFBFBD><C5B6><EFBFBD><EFBFBD><EFBFBD><EFBFBD>Y!",NULL);
 		    free(buf);
 		    return(-1);
 		}
@@ -2286,14 +2286,14 @@
 
     if(level < 0 || !headents[level].name){
 	(*term.t_beep)();
-	emlwrite("Sorry, I can't help you with that.", NULL);
+	emlwrite("<22>ܩ<EFBFBD><DCA9>p<EFBFBD>A<EFBFBD><41><EFBFBD>󨺭ӧڵL<DAB5>k<EFBFBD><6B><EFBFBD><EFBFBD><EFBFBD>C", NULL);
 	sleep(2);
 	return(FALSE);
     }
 
-    sprintf(buf, "Help for %s %.40s Field",
-		 (Pmaster->pine_flags & MDHDRONLY) ? "Address Book"
-						 : "Composer",
+    sprintf(buf, "%s<><73><EFBFBD><EFBFBD>%.40s<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>U<EFBFBD><EFBFBD><EFBFBD><EFBFBD>",
+		 (Pmaster->pine_flags & MDHDRONLY) ? "<22>a<EFBFBD>}ï"
+						 : "<22>s<EFBFBD>边",
 		 headents[level].name);
     (*Pmaster->helper)(headents[level].help, buf, 1);
     ttresize();
@@ -2923,7 +2923,7 @@
     }
     
     if((sbuf=(char *)malloc((unsigned) i)) == NULL){
-	emlwrite("Can't malloc space to expand address", NULL);
+	emlwrite("<22>L<EFBFBD>k<EFBFBD>t<EFBFBD>m<EFBFBD>O<EFBFBD><4F><EFBFBD><EFBFBD><EFBFBD>Ŷ<EFBFBD><C5B6>H<EFBFBD>i<EFBFBD>}<7D>a<EFBFBD>}", NULL);
 	return(-1);
     }
     
@@ -2980,7 +2980,7 @@
 		if(!arg){
 		    headarg = arg = (BUILDER_ARG *)malloc(sizeof(BUILDER_ARG));
 		    if(!arg){
-			emlwrite("Can't malloc space for fcc", NULL);
+			emlwrite("<22>L<EFBFBD>k<EFBFBD>t<EFBFBD>m<EFBFBD>O<EFBFBD><4F><EFBFBD><EFBFBD><EFBFBD>Ŷ<EFBFBD><C5B6><EFBFBD> fcc", NULL);
 			return(-1);
 		    }
 		    else{
@@ -2993,7 +2993,7 @@
 		else{
 		    nextarg = (BUILDER_ARG *)malloc(sizeof(BUILDER_ARG));
 		    if(!nextarg){
-			emlwrite("Can't malloc space for fcc", NULL);
+			emlwrite("<22>L<EFBFBD>k<EFBFBD>t<EFBFBD>m<EFBFBD>O<EFBFBD><4F><EFBFBD><EFBFBD><EFBFBD>Ŷ<EFBFBD><C5B6><EFBFBD> fcc", NULL);
 			return(-1);
 		    }
 		    else{
@@ -3009,7 +3009,7 @@
 		if(!e->sticky){
 		    line = e->hd_text;
 		    if(!(arg->tptr=(char *)malloc(strlen(line->text) + 1))){
-			emlwrite("Can't malloc space for fcc", NULL);
+			emlwrite("<22>L<EFBFBD>k<EFBFBD>t<EFBFBD>m<EFBFBD>O<EFBFBD><4F><EFBFBD><EFBFBD><EFBFBD>Ŷ<EFBFBD><C5B6><EFBFBD> fcc", NULL);
 			return(-1);
 		    }
 		    else
@@ -3026,7 +3026,7 @@
     if(!headarg){
 	headarg = (BUILDER_ARG *)malloc(sizeof(BUILDER_ARG));
 	if(!headarg){
-	    emlwrite("Can't malloc space", NULL);
+	    emlwrite("<22>L<EFBFBD>k<EFBFBD>t<EFBFBD>m<EFBFBD>O<EFBFBD><4F><EFBFBD><EFBFBD><EFBFBD>Ŷ<EFBFBD>", NULL);
 	    return(-1);
 	}
 	else{
@@ -3335,7 +3335,7 @@
 
     if(ksize()){
 	if((bp = buf = (char *)malloc(ksize()+5)) == NULL){
-	    emlwrite("Can't malloc space for saved text", NULL);
+	    emlwrite("<22>L<EFBFBD>k<EFBFBD>t<EFBFBD>m<EFBFBD>O<EFBFBD>s<EFBFBD><73><EFBFBD>r<EFBFBD><72><EFBFBD>O<EFBFBD><4F><EFBFBD><EFBFBD><EFBFBD>Ŷ<EFBFBD>", NULL);
 	    return(FALSE);
 	}
     }
@@ -3369,7 +3369,7 @@
 	work_buf_len = strlen(ods.cur_l->text) + buf_len;
 	work_buf = (char *) malloc((work_buf_len + 1) * sizeof(char));
 	if (work_buf == NULL) {
-	    emlwrite("Can't malloc space for saved text", NULL);
+	    emlwrite("<22>L<EFBFBD>k<EFBFBD>t<EFBFBD>m<EFBFBD>O<EFBFBD>s<EFBFBD><73><EFBFBD>r<EFBFBD><72><EFBFBD>O<EFBFBD><4F><EFBFBD><EFBFBD><EFBFBD>Ŷ<EFBFBD>", NULL);
 	    return(FALSE);
 	}
 
@@ -3578,9 +3578,9 @@
     if(Pmaster && Pmaster->exit_label)
       menu_header[SEND_KEY].label = Pmaster->exit_label;
     else if(gmode & (MDVIEW | MDHDRONLY))
-      menu_header[SEND_KEY].label =  (gmode & MDHDRONLY) ? "eXit/Save" : "eXit";
+      menu_header[SEND_KEY].label =  (gmode & MDHDRONLY) ? "<22><><EFBFBD>}/<2F>x<EFBFBD>s" : "<22><><EFBFBD>}";
     else
-      menu_header[SEND_KEY].label = "Send";
+      menu_header[SEND_KEY].label = "<22>e<EFBFBD>X";
 
     if(gmode & MDVIEW){
 	menu_header[CUT_KEY].name  = NULL;
@@ -3601,7 +3601,7 @@
 	menu_header[RICH_KEY].name  = NULL;
     }
     else{
-	menu_header[RICH_KEY].label = "Rich Hdr";
+	menu_header[RICH_KEY].label = "<22><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>Y";
 	menu_header[RICH_KEY].name  = "^R";
     }
 
@@ -3680,7 +3680,7 @@
                 *headents[i].realaddr = bufp;
             }
             else{
-                emlwrite("Can't make room to pack header field.", NULL);
+                emlwrite("<22>L<EFBFBD>k<EFBFBD>t<EFBFBD>m<EFBFBD>]<5D>˪<EFBFBD><CBAA>Y<EFBFBD><59><EFBFBD>쪺<EFBFBD>O<EFBFBD><4F><EFBFBD><EFBFBD><EFBFBD>Ŷ<EFBFBD><C5B6>C", NULL);
                 retval = FALSE;
             }
         }