Apple-2-SW/emailler
1
0
Fork 0
mirror of https://github.com/bobbimanners/emailler.git synced 2025-01-16 11:30:10 +00:00
Code Issues Projects Releases Wiki Activity

EDIT: More improvements/fixes to search-replace

Browse Source
This commit is contained in:
Bobbi Webber-Manners 2020-08-09 15:32:58 -04:00
parent 48dde08b86
commit 7e11679445
1 changed files with 9 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
apps/edit.c
View File

@ -1463,15 +1463,16 @@ search:
mode = SRCH1; // Searching .. mode = SRCH1; // Searching ..
update_status_line(); update_status_line();
if (search_in_gapbuf(gapend + 1, search, &foundpos) == 0) { if (search_in_gapbuf(gapend + 1, search, &foundpos) == 0) {
if (wrapcount > 0) if (wrapcount > 0) {
mode = SEL_NONE;
return; // Wrapped already. Give up. return; // Wrapped already. Give up.
}
++wrapcount; ++wrapcount;
mode = SRCH2; // Wrapped .. mode = SRCH2; // Wrapped ..
update_status_line(); update_status_line();
set_gapbuf(gapbegin, '\0'); // NULL term for search_in_gapbuf() set_gapbuf(gapbegin, '\0'); // NULL term for search_in_gapbuf()
if (search_in_gapbuf(0, search, &foundpos) == 0) { if (search_in_gapbuf(0, search, &foundpos) == 0) {
mode = SRCH3; // Not found .. mode = SRCH3; // Not found ..
update_status_line();
return; return;
} }
if (finish_search_replace(foundpos, r, ask) == 1) if (finish_search_replace(foundpos, r, ask) == 1)
@ -1605,32 +1606,23 @@ int edit(char *fname) {
break; // ESC pressed break; // ESC pressed
if (strlen(userentry) > 0) if (strlen(userentry) > 0)
strcpy(search, userentry); strcpy(search, userentry);
else { else if (strlen(search) == 0)
if (strlen(search) == 0) break;
break; cursor_right();
sprintf(userentry, "Search for '%s'", search);
if (prompt_okay(userentry) != 0)
break;
cursor_right();
}
if (tmp == 0) { // Replace mode if (tmp == 0) { // Replace mode
sprintf(userentry, "Replace (%s)", replace); sprintf(userentry, "Replace (%s)", replace);
if (prompt_for_name(userentry, 0) == 255) if (prompt_for_name(userentry, 0) == 255)
break; // ESC pressed break; // ESC pressed
if (strlen(userentry) > 0) if (strlen(userentry) > 0)
strcpy(replace, userentry); strcpy(replace, userentry);
else { else if (strlen(replace) == 0)
if (strlen(replace) == 0) break;
break;
sprintf(userentry, "Replace with '%s'", replace);
if (prompt_okay(userentry) != 0)
break;
}
ask = 0; ask = 0;
if (prompt_okay("Ask for each") == 0) if (prompt_okay("Ask for each") == 0)
ask = 1; ask = 1;
} }
do_search_replace(tmp, ask); do_search_replace(tmp, ask);
update_status_line();
break; break;
case 0x80 + 'I': // OA-I "Insert file" case 0x80 + 'I': // OA-I "Insert file"
case 0x80 + 'i': case 0x80 + 'i':