1998-08-09 00:51:28 +00:00
|
|
|
|
--- pico/search.c.orig Fri Jun 26 05:48:14 1998
|
|
|
|
|
+++ pico/search.c Tue Aug 4 12:42:15 1998
|
|
|
|
|
@@ -165,7 +165,7 @@
|
|
|
|
|
break;
|
|
|
|
|
default:
|
|
|
|
|
if(status == ABORT)
|
|
|
|
|
- emlwrite("Search Cancelled", NULL);
|
|
|
|
|
+ emlwrite("<22><><EFBFBD><EFBFBD><EFBFBD>j<EFBFBD>M", NULL);
|
|
|
|
|
else
|
|
|
|
|
mlerase();
|
|
|
|
|
curwp->w_flag |= WFMODE;
|
|
|
|
|
@@ -212,16 +212,16 @@
|
1998-02-02 14:34:45 +00:00
|
|
|
|
|
1998-08-09 00:51:28 +00:00
|
|
|
|
/* and complain if not there */
|
|
|
|
|
if (status == FALSE){
|
|
|
|
|
- emlwrite("\"%s\" not found", defpat);
|
|
|
|
|
+ emlwrite("<22>䤣<EFBFBD><E4A4A3> \"%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("<22><><EFBFBD>N%s<><73><EFBFBD>ɮװ_<D7B0>l<EFBFBD>q<EFBFBD>Y<EFBFBD>j<EFBFBD>M",
|
|
|
|
|
+ (status == ABORT) ? "<22>w<EFBFBD><77><EFBFBD><EFBFBD><EFBFBD>A<EFBFBD><41>" : "");
|
|
|
|
|
}
|
|
|
|
|
else if(wrapt == TRUE){
|
|
|
|
|
- emlwrite("Search Wrapped", NULL);
|
|
|
|
|
+ emlwrite("<22>q<EFBFBD>Y<EFBFBD>j<EFBFBD>M", NULL);
|
|
|
|
|
}
|
|
|
|
|
else if(status == TRUE){
|
|
|
|
|
emlwrite("", NULL);
|
|
|
|
|
@@ -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 = "<22><><EFBFBD>N<EFBFBD>Ҧ<EFBFBD>";
|
|
|
|
|
KS_OSDATASET(&menu_pat[0], KS_NONE);
|
|
|
|
|
menu_pat[1].name = NULL;
|
1998-02-02 14:34:45 +00:00
|
|
|
|
|
1998-08-09 00:51:28 +00:00
|
|
|
|
@@ -263,12 +263,12 @@
|
|
|
|
|
(*term.t_rev)(0);
|
1998-02-02 14:34:45 +00:00
|
|
|
|
|
1998-08-09 00:51:28 +00:00
|
|
|
|
if (repl_all)
|
|
|
|
|
- strcpy(prompt, "Replace every \"");
|
|
|
|
|
+ strcpy(prompt, "<22><><EFBFBD>N<EFBFBD>C<EFBFBD>@<40><> \"");
|
|
|
|
|
else
|
|
|
|
|
- strcpy(prompt, "Replace \"");
|
|
|
|
|
+ strcpy(prompt, "<22><><EFBFBD>N \"");
|
1998-02-02 14:34:45 +00:00
|
|
|
|
|
1998-08-09 00:51:28 +00:00
|
|
|
|
expandp(&defpat[0], &prompt[strlen(prompt)], NPAT/2);
|
|
|
|
|
- strcat(prompt, "\" with");
|
|
|
|
|
+ strcat(prompt, "\" <20><>");
|
|
|
|
|
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);
|
|
|
|
|
+ "<22>j<EFBFBD>M<EFBFBD><4D><EFBFBD><EFBFBD><EFBFBD>U<EFBFBD><55><EFBFBD><EFBFBD>", 1);
|
|
|
|
|
else
|
|
|
|
|
- pico_help(SearchHelpText, "Help for Searching", 1);
|
|
|
|
|
+ pico_help(SearchHelpText, "<22>j<EFBFBD>M<EFBFBD><4D><EFBFBD><EFBFBD><EFBFBD>U<EFBFBD><55><EFBFBD><EFBFBD>", 1);
|
1998-02-02 14:34:45 +00:00
|
|
|
|
|
1998-08-09 00:51:28 +00:00
|
|
|
|
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 = "<22><><EFBFBD>N<EFBFBD>Ҧ<EFBFBD>";
|
|
|
|
|
}else{
|
|
|
|
|
repl_all = TRUE;
|
|
|
|
|
- menu_pat[0].label = "Repl One";
|
|
|
|
|
+ menu_pat[0].label = "<22><><EFBFBD>N<EFBFBD>@<40><>";
|
|
|
|
|
}
|
|
|
|
|
break;
|
1998-07-30 12:30:41 +00:00
|
|
|
|
|
1998-08-09 00:51:28 +00:00
|
|
|
|
@@ -342,7 +342,7 @@
|
|
|
|
|
else
|
|
|
|
|
{
|
|
|
|
|
if(status == ABORT)
|
|
|
|
|
- emlwrite("Replacement Cancelled", NULL);
|
|
|
|
|
+ emlwrite("<22><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>N", NULL);
|
|
|
|
|
else
|
|
|
|
|
mlerase();
|
|
|
|
|
chword(defpat, defpat);
|
|
|
|
|
@@ -352,7 +352,7 @@
|
1998-02-02 14:34:45 +00:00
|
|
|
|
|
1998-08-09 00:51:28 +00:00
|
|
|
|
default:
|
|
|
|
|
if(status == ABORT)
|
|
|
|
|
- emlwrite("Replacement Cancelled", NULL);
|
|
|
|
|
+ emlwrite("<22><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>N", NULL);
|
|
|
|
|
else
|
|
|
|
|
mlerase();
|
|
|
|
|
chword(defpat, defpat);
|
|
|
|
|
@@ -384,9 +384,9 @@
|
|
|
|
|
(*term.t_rev)(0);
|
|
|
|
|
fflush(stdout);
|
1998-07-21 14:11:48 +00:00
|
|
|
|
|
1998-08-09 00:51:28 +00:00
|
|
|
|
- strcpy(prompt, "Replace \"");
|
|
|
|
|
+ strcpy(prompt, "<22><><EFBFBD>N \"");
|
|
|
|
|
expandp(&orig[0], &prompt[strlen(prompt)], NPAT/2);
|
|
|
|
|
- strcat(prompt, "\" with \"");
|
|
|
|
|
+ strcat(prompt, "\" <20><> \"");
|
|
|
|
|
expandp(&repl[0], &prompt[strlen(prompt)], NPAT/2);
|
|
|
|
|
strcat(prompt, "\"");
|
|
|
|
|
|
|
|
|
|
@@ -400,13 +400,13 @@
|
|
|
|
|
chword(orig, orig); /* replace word by itself */
|
|
|
|
|
update();
|
|
|
|
|
if(status == ABORT){ /* if cancelled return */
|
|
|
|
|
- emlwrite("Replace All cancelled after %d changes", (char *) n);
|
|
|
|
|
+ emlwrite("<22>b<EFBFBD><62><EFBFBD><EFBFBD><EFBFBD>u<EFBFBD><75><EFBFBD>N<EFBFBD>Ҧ<EFBFBD><D2A6>v<EFBFBD><76><EFBFBD>e<EFBFBD>A<EFBFBD>w<EFBFBD><77><EFBFBD>L %d <20>ӧ<EFBFBD><D3A7><EFBFBD>", (char *) n);
|
|
|
|
|
return (ABORT); /* ... else keep looking */
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
else{
|
|
|
|
|
- emlwrite("No more matches for \"%s\"", orig);
|
|
|
|
|
+ emlwrite("<22>S<EFBFBD><53><EFBFBD>ŦX \"%s\" <20><><EFBFBD>r<EFBFBD><72><EFBFBD>F", orig);
|
|
|
|
|
return (FALSE);
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
@@ -423,18 +423,18 @@
|
|
|
|
|
EXTRAKEYS menu_pat[4];
|
|
|
|
|
|
|
|
|
|
menu_pat[0].name = "^Y";
|
|
|
|
|
- menu_pat[0].label = "FirstLine";
|
|
|
|
|
+ menu_pat[0].label = "<22>Ĥ@<40><>";
|
|
|
|
|
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 = "<22>̫<EFBFBD><CCAB>@<40><>";
|
|
|
|
|
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 = "Don't Replace";
|
|
|
|
|
+ menu_pat[2].label = "<22><><EFBFBD><EFBFBD><EFBFBD>N";
|
|
|
|
|
else
|
|
|
|
|
- menu_pat[2].label = "Replace";
|
|
|
|
|
+ menu_pat[2].label = "<22><><EFBFBD>N";
|
|
|
|
|
menu_pat[2].key = (CTRL|'R');
|
|
|
|
|
KS_OSDATASET(&menu_pat[2], KS_NONE);
|
|
|
|
|
menu_pat[3].name = NULL;
|
|
|
|
|
@@ -485,11 +485,11 @@
|
|
|
|
|
EXTRAKEYS menu_pat[3];
|
|
|
|
|
|
|
|
|
|
menu_pat[0].name = "^Y";
|
|
|
|
|
- menu_pat[0].label = "FirstLine";
|
|
|
|
|
+ menu_pat[0].label = "<22>Ĥ@<40><>";
|
|
|
|
|
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 = "<22>̫<EFBFBD><CCAB>@<40><>";
|
|
|
|
|
menu_pat[1].key = (CTRL|'V');
|
|
|
|
|
KS_OSDATASET(&menu_pat[1], KS_NONE);
|
|
|
|
|
menu_pat[2].name = NULL;
|