head	1.8;
access;
symbols
	RELEASE_4_2_0:1.7
	RELEASE_4_1_1:1.7
	RELEASE_4_1_0:1.7
	RELEASE_3_5_0:1.7
	RELEASE_4_0_0:1.7
	RELEASE_3_4_0:1.7
	RELEASE_3_3_0:1.6
	RELEASE_3_2_0:1.6
	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.8
date	2000.11.17.19.06.52;	author keith;	state dead;
branches;
next	1.7;

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

1.6
date	98.10.10.04.29.21;	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.38;	author vanilla;	state Exp;
branches;
next	1.1;

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


desc
@@


1.8
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
@--- pico/search.c.orig	Tue Oct  5 05:49:41 1999
+++ pico/search.c	Thu Oct 14 11:36:00 1999
@@@@ -131,9 +131,9 @@@@
     while(1){
 
 	if (gmode & MDREPLACE)
-	  status = srpat("Search", defpat, repl_mode);
+	  status = srpat("jM", defpat, repl_mode);
 	else
-	  status = readpattern("Search", TRUE);
+	  status = readpattern("jM", TRUE);
 
 	switch(status){
 	  case TRUE:                         /* user typed something */
@@@@ -146,14 +146,14 @@@@
 
 		saved_state = save_pico_state();
 		(*Pmaster->helper)(Pmaster->search_help,
-				   "Help for Searching", 1);
+				   "jMU", 1);
 		if(saved_state){
 		    restore_pico_state(saved_state);
 		    free_pico_state(saved_state);
 		}
 	    }
 	    else
-	      pico_help(SearchHelpText, "Help for Searching", 1);
+	      pico_help(SearchHelpText, "jMU", 1);
 
 	  case (CTRL|'L'):			/* redraw requested */
 	    refresh(FALSE, 1);
@@@@ -235,7 +235,7 @@@@
 
 	  default:
 	    if(status == ABORT)
-	      emlwrite("Search Cancelled", NULL);
+	      emlwrite("jM", NULL);
 	    else
 	      mlerase();
 
@@@@ -283,16 +283,16 @@@@
 
     /* and complain if not there */
     if (status == FALSE){
-      emlwrite("\"%s\" not found", defpat);
+      emlwrite("䤣 \"%s\"", defpat);
     }
     else if((gmode & MDREPLACE) && repl_mode == TRUE){
         status = replace_pat(defpat, &wrapt2);    /* replace pattern */
 	if (wrapt == TRUE || wrapt2 == TRUE)
-	  emlwrite("Replacement %srapped",
-		   (status == ABORT) ? "cancelled but w" : "W");
+	  emlwrite("N%sɮװ_lqYjM",
+		   (status == ABORT) ? "wA" : "");
     }
     else if(wrapt == TRUE){
-	emlwrite("Search Wrapped", NULL);
+	emlwrite("qYjM", NULL);
     }
     else if(status == TRUE){
 	emlwrite("", NULL);
@@@@ -321,7 +321,7 @@@@
     /* additional 'replace all' menu option */
     menu_pat[0].name  = "^X";
     menu_pat[0].key   = (CTRL|'X');
-    menu_pat[0].label = "Repl All";
+    menu_pat[0].label = "NҦ";
     KS_OSDATASET(&menu_pat[0], KS_NONE);
     menu_pat[1].name  = NULL;
 
@@@@ -333,10 +333,10 @@@@
 	pputs(origpat, 1);                       /* highlight word */
 	(*term.t_rev)(0);
 
-	sprintf(prompt, "Replace%s \"", repl_all ? " every" : "");
+	sprintf(prompt, "N%s \"", repl_all ? "C@@" : "");
 
 	expandp(&defpat[0], &prompt[strlen(prompt)], NPAT/2);
-	strcat(prompt, "\" with");
+	strcat(prompt, "\" ");
 	if(rpat[0] != 0){
 	    strcat(prompt, " [");
 	    expandp(rpat, &prompt[strlen(prompt)], NPAT/2);
@@@@ -378,14 +378,14 @@@@
 
 		saved_state = save_pico_state();
 		(*Pmaster->helper)(Pmaster->search_help,
-				   "Help for Searching", 1);
+				   "jMU", 1);
 		if(saved_state){
 		    restore_pico_state(saved_state);
 		    free_pico_state(saved_state);
 		}
 	    }
 	    else
-	      pico_help(SearchHelpText, "Help for Searching", 1);
+	      pico_help(SearchHelpText, "jMU", 1);
 
 	  case (CTRL|'L'):			/* redraw requested */
 	    refresh(FALSE, 1);
@@@@ -395,18 +395,18 @@@@
 	  case (CTRL|'X'):        /* toggle replace all option */
 	    if (repl_all){
 		repl_all = FALSE;
-		menu_pat[0].label = "Repl All";
+		menu_pat[0].label = "NҦ";
 	    }
 	    else{
 		repl_all = TRUE;
-		menu_pat[0].label = "Repl One";
+		menu_pat[0].label = "N@@";
 	    }
 
 	    break;
 
 	  default:
 	    if(status == ABORT)
-	      emlwrite("Replacement Cancelled", NULL);
+	      emlwrite("N", NULL);
 	    else 
 	      mlerase();
 	    chword(defpat, origpat);
@@@@ -455,9 +455,9 @@@@
 	(*term.t_rev)(0);
 	fflush(stdout);
 
-	strcpy(prompt, "Replace \"");
+	strcpy(prompt, "N \"");
 	expandp(&orig[0], &prompt[strlen(prompt)], NPAT/2);
-	strcat(prompt, "\" with \"");
+	strcat(prompt, "\"  \"");
 	expandp(&repl[0], &prompt[strlen(prompt)], NPAT/2);
 	strcat(prompt, "\"");
 
@@@@ -471,13 +471,13 @@@@
 	    chword(realpat, realpat);	       /* replace word by itself */
 	    update();
 	    if(status == ABORT){		/* if cancelled return */
-		emlwrite("Replace All cancelled after %d changes", (char *) n);
+		emlwrite("buNҦveAwL %d ӧ", (char *) n);
 		return (ABORT);			/* ... else keep looking */
 	    }
 	}
     }
     else{
-	emlwrite("No more matches for \"%s\"", orig);
+	emlwrite("SŦX \"%s\" rF", orig);
 	return (FALSE);
     }
 }
@@@@ -495,33 +495,33 @@@@
 	EXTRAKEYS    menu_pat[7];
 
 	menu_pat[i = 0].name = "^Y";
-	menu_pat[i].label    = "FirstLine";
+	menu_pat[i].label    = "Ĥ@@";
 	menu_pat[i].key	     = (CTRL|'Y');
 	KS_OSDATASET(&menu_pat[i], KS_NONE);
 
 	menu_pat[++i].name = "^V";
-	menu_pat[i].label  = "LastLine";
+	menu_pat[i].label  = "̫@@";
 	menu_pat[i].key	   = (CTRL|'V');
 	KS_OSDATASET(&menu_pat[i], KS_NONE);
 
 	menu_pat[++i].name = "^R";
-	menu_pat[i].label  = repl_mode ? "No Replace" : "Replace";
+	menu_pat[i].label  = repl_mode ? "N" : "N";
 	menu_pat[i].key	   = (CTRL|'R');
 	KS_OSDATASET(&menu_pat[i], KS_NONE);
 
 	if(!repl_mode){
 	    menu_pat[++i].name = "^T";
-	    menu_pat[i].label  = "LineNumber";
+	    menu_pat[i].label  = "渹";
 	    menu_pat[i].key    = (CTRL|'T');
 	    KS_OSDATASET(&menu_pat[i], KS_NONE);
 
 	    menu_pat[++i].name = "^W";
-	    menu_pat[i].label  = "Start of Para";
+	    menu_pat[i].label  = "q_l";
 	    menu_pat[i].key    = (CTRL|'W');
 	    KS_OSDATASET(&menu_pat[i], KS_NONE);
 
 	    menu_pat[++i].name = "^O";
-	    menu_pat[i].label  = "End of Para";
+	    menu_pat[i].label  = "q";
 	    menu_pat[i].key    = (CTRL|'O');
 	    KS_OSDATASET(&menu_pat[i], KS_NONE);
 	}
@@@@ -577,7 +577,7 @@@@
     EXTRAKEYS    menu_pat[2];
 
     menu_pat[i = 0].name  = "^T";
-    menu_pat[i].label	  = "No Line Number";
+    menu_pat[i].label	  = "L渹";
     menu_pat[i].key	  = (CTRL|'T');
     KS_OSDATASET(&menu_pat[i++], KS_NONE);
 
@@@@ -622,28 +622,28 @@@@
 	EXTRAKEYS    menu_pat[6];
 
 	menu_pat[i = 0].name = "^Y";
-	menu_pat[i].label    = "FirstLine";
+	menu_pat[i].label    = "Ĥ@@";
 	menu_pat[i].key	     = (CTRL|'Y');
 	KS_OSDATASET(&menu_pat[i], KS_NONE);
 
 	menu_pat[++i].name = "^V";
-	menu_pat[i].label  = "LastLine";
+	menu_pat[i].label  = "̫@@";
 	menu_pat[i].key	   = (CTRL|'V');
 	KS_OSDATASET(&menu_pat[i], KS_NONE);
 
 	if(text_mode){
 	    menu_pat[++i].name = "^T";
-	    menu_pat[i].label  = "LineNumber";
+	    menu_pat[i].label  = "渹";
 	    menu_pat[i].key    = (CTRL|'T');
 	    KS_OSDATASET(&menu_pat[i], KS_NONE);
 
 	    menu_pat[++i].name = "^W";
-	    menu_pat[i].label  = "Start of Para";
+	    menu_pat[i].label  = "q_l";
 	    menu_pat[i].key    = (CTRL|'W');
 	    KS_OSDATASET(&menu_pat[i], KS_NONE);
 
 	    menu_pat[++i].name = "^O";
-	    menu_pat[i].label  = "End of Para";
+	    menu_pat[i].label  = "q";
 	    menu_pat[i].key    = (CTRL|'O');
 	    KS_OSDATASET(&menu_pat[i], KS_NONE);
 	}
@


1.7
log
@Update to version 4.20.

PR:		14575
Submitted by:	maintainer
@
text
@@


1.6
log
@Update to version 4.05.

PR:		8025
Submitted by:	maintainer
@
text
@d1 3
a3 4
--- pico/search.c.orig	Sat Sep 12 01:15:02 1998
+++ pico/search.c	Tue Sep 22 18:54:24 1998
@@@@ -127,9 +127,9 @@@@
     /* ask the user for the text of a pattern */
d5 1
d10 2
a11 2
-	  status = readpattern("Search");
+	  status = readpattern("jM");
d15 1
a15 1
@@@@ -142,14 +142,14 @@@@
d32 1
a32 1
@@@@ -179,7 +179,7 @@@@
d41 1
a41 1
@@@@ -228,16 +228,16 @@@@
d62 1
a62 1
@@@@ -267,7 +267,7 @@@@
d71 1
a71 1
@@@@ -279,10 +279,10 @@@@
d84 1
a84 1
@@@@ -324,14 +324,14 @@@@
d101 1
a101 1
@@@@ -341,18 +341,18 @@@@
d123 1
a123 1
@@@@ -401,9 +401,9 @@@@
d135 1
a135 1
@@@@ -417,13 +417,13 @@@@
d151 42
a192 2
@@@@ -440,18 +440,18 @@@@
 	EXTRAKEYS    menu_pat[4];
d194 40
a233 34
 	menu_pat[0].name  = "^Y";
-	menu_pat[0].label = "FirstLine";
+	menu_pat[0].label = "Ĥ@@";
 	menu_pat[0].key   = (CTRL|'Y');
 	KS_OSDATASET(&menu_pat[0], KS_NONE);
 	menu_pat[1].name  = "^V";
-	menu_pat[1].label = "LastLine";
+	menu_pat[1].label = "̫@@";
 	menu_pat[1].key   = (CTRL|'V');
 	KS_OSDATASET(&menu_pat[1], KS_NONE);
 	menu_pat[2].name  = "^R";
 	if (repl_mode)
-	  menu_pat[2].label = "No Replace";
+	  menu_pat[2].label = "N";
 	else
-	  menu_pat[2].label = "Replace";
+	  menu_pat[2].label = "N";
 	menu_pat[2].key   = (CTRL|'R');
 	KS_OSDATASET(&menu_pat[2], KS_NONE);
 	menu_pat[3].name  = NULL;
@@@@ -504,11 +504,11 @@@@
 	EXTRAKEYS    menu_pat[3];
 
 	menu_pat[0].name  = "^Y";
-	menu_pat[0].label = "FirstLine";
+	menu_pat[0].label = "Ĥ@@";
 	menu_pat[0].key   = (CTRL|'Y');
 	KS_OSDATASET(&menu_pat[0], KS_NONE);
 	menu_pat[1].name  = "^V";
-	menu_pat[1].label = "LastLine";
+	menu_pat[1].label = "̫@@";
 	menu_pat[1].key   = (CTRL|'V');
 	KS_OSDATASET(&menu_pat[1], KS_NONE);
 	menu_pat[2].name  = NULL;
@


1.5
log
@Update to version 4.0a2.

PR:		7672
Submitted by:	maintainer
@
text
@d1 2
a2 2
--- pico/search.c.orig	Fri Jun 26 05:48:14 1998
+++ pico/search.c	Wed Aug 19 10:45:20 1998
d6 36
a41 31
 	 if (gmode & MDREPLACE)
-	   status = srpat("Search", defpat, repl_mode);
+	   status = srpat("jM", defpat, repl_mode);
 	 else
-	   status = readpattern("Search");
+	   status = readpattern("jM");
 
 	    switch(status){
 	      case TRUE:                         /* user typed something */
@@@@ -138,9 +138,9 @@@@
 	      case HELPCH:			/* help requested */
 		if(Pmaster)
 		  (*Pmaster->helper)(Pmaster->search_help,
-				     "Help for Searching", 1);
+				     "jMU", 1);
 		else
-		  pico_help(SearchHelpText, "Help for Searching", 1);
+		  pico_help(SearchHelpText, "jMU", 1);
 	      case (CTRL|'L'):			/* redraw requested */
 		refresh(FALSE, 1);
 		update();
@@@@ -165,7 +165,7 @@@@
 	        break;
 	      default:
 		if(status == ABORT)
-		  emlwrite("Search Cancelled", NULL);
+		  emlwrite("jM", NULL);
 		else
 		  mlerase();
 		curwp->w_flag |= WFMODE;
@@@@ -212,16 +212,16 @@@@
d62 33
a94 15
@@@@ -251,7 +251,7 @@@@
 	/* additional 'replace all' menu option */
         menu_pat[0].name  = "^X";
         menu_pat[0].key   = (CTRL|'X');
-        menu_pat[0].label = "Repl All";
+        menu_pat[0].label = "NҦ";
         KS_OSDATASET(&menu_pat[0], KS_NONE);
 	menu_pat[1].name  = NULL;
 
@@@@ -263,12 +263,12 @@@@
            (*term.t_rev)(0);
 
 	    if (repl_all)
-	      strcpy(prompt, "Replace every \"");
+	      strcpy(prompt, "NC@@ \"");
d96 2
a97 2
-	      strcpy(prompt, "Replace \"");
+	      strcpy(prompt, "N \"");
d99 16
a114 30
 	    expandp(&defpat[0], &prompt[strlen(prompt)], NPAT/2);
-	    strcat(prompt, "\" with");
+	    strcat(prompt, "\" ");
 	    if(rpat[0] != 0){
 		strcat(prompt, " [");
 		expandp(rpat, &prompt[strlen(prompt)], NPAT/2);
@@@@ -286,9 +286,9 @@@@
             case HELPCH:                      /* help requested */
                 if(Pmaster)
                   (*Pmaster->helper)(Pmaster->search_help,
-                                     "Help for Searching", 1);
+                                     "jMU", 1);
                 else
-                  pico_help(SearchHelpText, "Help for Searching", 1);
+                  pico_help(SearchHelpText, "jMU", 1);
 
 	    case (CTRL|'L'):			/* redraw requested */
 		refresh(FALSE, 1);
@@@@ -298,10 +298,10 @@@@
 	    case (CTRL|'X'):        /* toggle replace all option */
 	        if (repl_all){
 		  repl_all = FALSE;
-		  menu_pat[0].label = "Repl All";
+		  menu_pat[0].label = "NҦ";
 	        }else{
 		  repl_all = TRUE;
-		  menu_pat[0].label = "Repl One";
+		  menu_pat[0].label = "N@@";
 		}
 	        break;
d116 8
a123 19
@@@@ -342,7 +342,7 @@@@
 		else
 		{
 		  if(status == ABORT)
-		    emlwrite("Replacement Cancelled", NULL);
+		    emlwrite("N", NULL);
 		  else
 		    mlerase();
 		  chword(defpat, defpat);
@@@@ -352,7 +352,7 @@@@
 
 	    default:
                 if(status == ABORT)
-                  emlwrite("Replacement Cancelled", NULL);
+                  emlwrite("N", NULL);
                 else
                   mlerase();
 		chword(defpat, defpat);
@@@@ -384,9 +384,9 @@@@
d135 2
a136 2
@@@@ -400,13 +400,13 @@@@
 	    chword(orig, orig);			/* replace word by itself */
d151 1
a151 1
@@@@ -423,18 +423,18 @@@@
d166 1
a166 1
-	  menu_pat[2].label = "Don't Replace";
d174 1
a174 1
@@@@ -485,11 +485,11 @@@@
@


1.4
log
@Cleanups from maintainer.

PR:		7468
Submitted by:	maintainer
@
text
@d2 25
a26 1
+++ pico/search.c	Tue Aug  4 12:42:15 1998
@


1.3
log
@Upgrade to 4.02,
Submitted by:	maintainer
@
text
@d1 165
a165 31
--- pine/osdep/os-bsf.h.orig	Fri Jun 26 14:19:54 1998
+++ pine/osdep/os-bsf.h	Tue Jul 28 08:35:05 1998
@@@@ -87,7 +87,7 @@@@
    NOTE: You'll also have to make sure the appropriate osdep/postreap.*
          file is included in the os-*.ic file for your system.
  ----*/
-/* #define BACKGROUND_POST  /* comment out to disable posting from child */
+#define BACKGROUND_POST     /* comment out to disable posting from child */
 
 
 
@@@@ -219,7 +219,9 @@@@
 /*----------------------------------------------------------------------
    If no nntp-servers are defined, this program will be used to post news.
  ----*/
-#define SENDNEWS	"/usr/local/news/inews -h"	/* news posting cmd */
+#define SENDNEWS	"/usr/local/news/lib/inews -h"	/* For NN inews    */
+/*#define SENDNEWS	"/usr/local/bin/inews -h"	/* For INN inews   */
+/*#define SENDNEWS	"/usr/local/bin/inews -h"	/* For Cnews inews */
 
 
 /*--------- Program employed by users to change their password ---------*/
@@@@ -268,7 +270,7 @@@@
        8
        9 logs gross details of command execution
  ----*/
-#define DEFAULT_DEBUG 2
+#define DEFAULT_DEBUG 0
 
 
 
@


1.2
log
@Upgrade to 4.00
Submitted by:	Liang Tai-hwa <avatar@@www.mmlab.cse.yzu.edu.tw>
@
text
@d1 31
a31 101
--- pine/help.c.orig	Wed Jul  1 06:22:26 1998
+++ pine/help.c	Wed Jul 15 17:02:33 1998
@@@@ -50,15 +50,15 @@@@
 
 static struct key help_keys[] =
        {MAIN_MENU,
-	{"E","Exit Help",{MC_EXIT,1,{'e'}}, KS_EXITMODE},
+	{"E","}",{MC_EXIT,1,{'e'}}, KS_EXITMODE},
 	{NULL,NULL,{MC_EXIT,1,{'e'}}, KS_EXITMODE},
 	{NULL,NULL,{MC_VIEW_HANDLE,3,{'v',ctrl('m'),ctrl('j')}},KS_NONE},
-	{"^B","PrevLink",{MC_PREV_HANDLE,1,{ctrl('B')}},KS_NONE},
-	{"^F","NextLink",{MC_NEXT_HANDLE,1,{ctrl('F')}},KS_NONE},
+	{"^B","e@@s",{MC_PREV_HANDLE,1,{ctrl('B')}},KS_NONE},
+	{"^F","@@s",{MC_NEXT_HANDLE,1,{ctrl('F')}},KS_NONE},
 	PREVPAGE_MENU,
 	NEXTPAGE_MENU,
 	PRYNTMSG_MENU,
-	{"Z","Print All",{MC_PRINTALL,1,{'z'}},KS_NONE},
+	{"Z","CL",{MC_PRINTALL,1,{'z'}},KS_NONE},
 	NULL_MENU,
 	WHEREIS_MENU};
 INST_KEY_MENU(help_keymenu, help_keys);
@@@@ -77,7 +77,7 @@@@
 static struct key gripe_modal_keys[] = 
        {NULL_MENU,
 	NULL_MENU,
-	{"Ret","Finished",{MC_EXIT,2,{ctrl('m'),ctrl('j')}},KS_NONE},
+	{"Ret","",{MC_EXIT,2,{ctrl('m'),ctrl('j')}},KS_NONE},
 	NULL_MENU,
 	NULL_MENU,
 	NULL_MENU,
@@@@ -269,7 +269,7 @@@@
 		memset(&sargs, 0, sizeof(SCROLL_S));
 		sargs.text.text	   = so_text(store);
 		sargs.text.src	   = CharStar;
-		sargs.text.desc	   = "help text";
+		sargs.text.desc	   = "Ur";
 		sargs.text.handles = handles;
 		if(!(sargs.bar.title = title)){
 		    if(!struncmp(shown_text[0], "<html>", 6)){
@@@@ -297,7 +297,7 @@@@
 		    }
 
 		    if(!sargs.bar.title)
-		      sargs.bar.title = "HELP TEXT";
+		      sargs.bar.title = "Ur";
 		}
 
 		sargs.bar.style	   = TextPercent;
@@@@ -313,13 +313,13 @@@@
 		setbitmap(sargs.keys.bitmap);
 		if(flags & HLPD_FROMHELP){
 		    km.keys[HLP_EXIT_KEY].name	     = "P";
-		    km.keys[HLP_EXIT_KEY].label	     = "Prev Help";
+		    km.keys[HLP_EXIT_KEY].label	     = "e@@";
 		    km.keys[HLP_EXIT_KEY].bind.cmd   = MC_FINISH;
 		    km.keys[HLP_EXIT_KEY].bind.ch[0] = 'p';
 		}
 		else{
 		    km.keys[HLP_EXIT_KEY].name	     = "E";
-		    km.keys[HLP_EXIT_KEY].label	     = "Exit Help";
+		    km.keys[HLP_EXIT_KEY].label	     = "}";
 		    km.keys[HLP_EXIT_KEY].bind.cmd   = MC_EXIT;
 		    km.keys[HLP_EXIT_KEY].bind.ch[0] = 'e';
 		    clrbitn(HLP_SUBEXIT_KEY, sargs.keys.bitmap);
@@@@ -478,7 +478,7 @@@@
 	}
 
 	sparms->keys.menu->keys[HLP_VIEW_HANDLE].name  = "V";
-	sparms->keys.menu->keys[HLP_VIEW_HANDLE].label = "[View Link]";
+	sparms->keys.menu->keys[HLP_VIEW_HANDLE].label = "[˵s]";
     }
 }
 
@@@@ -559,7 +559,7 @@@@
 #endif
 	    if(ps_global->intr_pending){
 		q_status_message(SM_ORDER, 3, 3,
-				 "Print of all help cancelled");
+				 "CLҦU");
 		break;
 	    }
 
@@@@ -948,7 +948,7 @@@@
     memset(&sargs, 0, sizeof(SCROLL_S));
     sargs.text.text = tmp_text;
     sargs.text.src  = CharStar;
-    sargs.text.desc = "journal";
+    sargs.text.desc = "x";
     sargs.bar.title = title;
     sargs.start.on  = LastPage;
 
@@@@ -1304,7 +1304,7 @@@@
 #endif
 	    }
 	    else if(ch == 'x'){
-		q_status_message(SM_ORDER, 0, 3, "Bug report cancelled.");
+		q_status_message(SM_ORDER, 0, 3, "~^C");
 		return(-1);
 	    }
 	}
@


1.1
log
@Add a lot of patches of chinese menu.
Submitted by:	maintainer
@
text
@d1 101
a101 84
--- pine/send.c.orig	Sat Jan 17 19:54:07 1998
+++ pine/send.c	Sat Jan 17 21:22:38 1998
@@@@ -50,6 +50,7 @@@@
 #include "../c-client/smtp.h"
 #include "../c-client/nntp.h"
 
+#define bitstrip(x) (x)
 
 #ifndef TCPSTREAM
 #define TCPSTREAM void
@@@@ -1076,31 +1077,31 @@@@
 */
 static struct headerentry he_template[]={
   {"From    : ",  "From",        h_composer_from,       10, 0, NULL,
-   build_address, NULL, NULL, addr_book_compose,    "To AddrBk",
+   build_address, NULL, NULL, addr_book_compose,    "a}C",
    0, 1, 0, 1, 0, 1, 0, 0, 0, KS_TOADDRBOOK},
   {"Reply-To: ",  "Reply To",    h_composer_reply_to,   10, 0, NULL,
-   build_address, NULL, NULL, addr_book_compose,    "To AddrBk",
+   build_address, NULL, NULL, addr_book_compose,    "a}C",
    0, 1, 0, 1, 0, 1, 0, 0, 0, KS_TOADDRBOOK},
   {"To      : ",  "To",          h_composer_to,         10, 0, NULL,
-   build_address, NULL, NULL, addr_book_compose,    "To AddrBk",
+   build_address, NULL, NULL, addr_book_compose,    "a}C",
    0, 1, 0, 0, 0, 1, 0, 0, 0, KS_TOADDRBOOK},
   {"Cc      : ",  "Cc",          h_composer_cc,         10, 0, NULL,
-   build_address, NULL, NULL, addr_book_compose,    "To AddrBk",
+   build_address, NULL, NULL, addr_book_compose,    "a}C",
    0, 1, 0, 0, 0, 1, 0, 0, 0, KS_TOADDRBOOK},
   {"Bcc     : ",  "Bcc",         h_composer_bcc,        10, 0, NULL,
-   build_address, NULL, NULL, addr_book_compose,    "To AddrBk",
+   build_address, NULL, NULL, addr_book_compose,    "a}C",
    0, 1, 0, 1, 0, 1, 0, 0, 0, KS_TOADDRBOOK},
   {"Newsgrps: ",  "Newsgroups",  h_composer_news,        10, 0, NULL,
-   news_build,    NULL, NULL, news_group_selector,  "To NwsGrps",
+   news_build,    NULL, NULL, news_group_selector,  "sDոsC",
    0, 1, 0, 1, 0, 1, 0, 0, 0, KS_NONE},
   {"Fcc     : ",  "Fcc",         h_composer_fcc,        10, 0, NULL,
-   NULL,          NULL, NULL, folders_for_fcc,      "To Fldrs",
+   NULL,          NULL, NULL, folders_for_fcc,      "HC",
    0, 0, 0, 1, 1, 1, 0, 0, 0, KS_NONE},
   {"Lcc     : ",  "Lcc",         h_composer_lcc,        10, 0, NULL,
-   build_addr_lcc, NULL, NULL, addr_book_compose_lcc,"To AddrBk",
+   build_addr_lcc, NULL, NULL, addr_book_compose_lcc,"a}C",
    0, 1, 0, 1, 0, 1, 0, 0, 0, KS_NONE},
   {"Attchmnt: ",  "Attchmnt",    h_composer_attachment, 10, 0, NULL,
-   NULL,          NULL, NULL, NULL,                 "To Files",
+   NULL,          NULL, NULL, NULL,                 "ɮצC",
    0, 1, 1, 0, 0, 1, 0, 0, 0, KS_NONE},
   {"Subject : ",  "Subject",     h_composer_subject,    10, 0, NULL,
    valid_subject, NULL, NULL, NULL,                 NULL,
@@@@ -1132,7 +1133,7 @@@@
 
 static struct headerentry he_custom_addr_templ={
    NULL,          NULL,          h_composer_custom_addr,10, 0, NULL,
-   build_address, NULL, NULL, addr_book_compose,    "To AddrBk",
+   build_address, NULL, NULL, addr_book_compose,    "a}C",
    0, 1, 0, 1, 0, 1, 0, 0, 0, KS_TOADDRBOOK};
 static struct headerentry he_custom_free_templ={
    NULL,          NULL,          h_composer_custom_free,10, 0, NULL,
@@@@ -1407,7 +1408,7 @@@@
     ekey[0].ch    = ctrl('T');
     ekey[0].rval  = 2;
     ekey[0].name  = "^T";
-    ekey[0].label = "To AddrBk";
+    ekey[0].label = "a}C";
     ekey[1].ch    = -1;
 
     /*----------------------------------------------------------------------
@@@@ -3419,12 +3420,12 @@@@
     opts[i].ch      = 'y';
     opts[i].rval    = 'y';
     opts[i].name    = "Y";
-    opts[i++].label = "Yes";
+    opts[i++].label = "O";
 
     opts[i].ch      = 'n';
     opts[i].rval    = 'n';
     opts[i].name    = "N";
-    opts[i++].label = "No";
+    opts[i++].label = "_";
 
     if(filters){
 	/* set global_filter_pointer to desired filter or NULL if none */
@
