mirrors/nano
1
0
Fork 0
mirror of git://git.sv.gnu.org/nano.git synced 2024-11-25 22:29:42 +03:00
Code Issues Packages Projects Releases Wiki Activity

search: suppress the "Search Wrapped" message when doing replacements

Browse Source 
This completes the fix for https://savannah.gnu.org/bugs/?52282.
Reported-by: Chime Hart <chime@hubert-humphrey.com>
This commit is contained in:
Benno Schulenberg 2017-10-26 19:15:11 +02:00
parent d4945c67a4
commit ded02d858f
4 changed files with 18 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/nano.h
View File

@ -138,6 +138,10 @@
#define BLIND FALSE #define BLIND FALSE
#define VISIBLE TRUE #define VISIBLE TRUE
#define JUSTFIND 0
#define REPLACING 1
#define INREGION 2
/* Enumeration types. */ /* Enumeration types. */
typedef enum { typedef enum {
NIX_FILE, DOS_FILE, MAC_FILE NIX_FILE, DOS_FILE, MAC_FILE

2
src/proto.h
View File

@ -497,7 +497,7 @@ void do_rcfiles(void);
/* Most functions in search.c. */ /* Most functions in search.c. */
void not_found_msg(const char *str); void not_found_msg(const char *str);
void search_replace_abort(void); void search_replace_abort(void);
int findnextstr(const char *needle, bool whole_word_only, bool have_region, int findnextstr(const char *needle, bool whole_word_only, int modus,
size_t *match_len, bool skipone, const filestruct *begin, size_t begin_x); size_t *match_len, bool skipone, const filestruct *begin, size_t begin_x);
void do_search(void); void do_search(void);
void do_search_forward(void); void do_search_forward(void);

22
src/search.c
View File

@ -205,7 +205,7 @@ int search_init(bool replacing, bool use_answer)
* where we first started searching, at column begin_x. Return 1 when we * where we first started searching, at column begin_x. Return 1 when we
* found something, 0 when nothing, and -2 on cancel. When match_len is * found something, 0 when nothing, and -2 on cancel. When match_len is
* not NULL, set it to the length of the found string, if any. */ * not NULL, set it to the length of the found string, if any. */
int findnextstr(const char *needle, bool whole_word_only, bool have_region, int findnextstr(const char *needle, bool whole_word_only, int modus,
size_t *match_len, bool skipone, const filestruct *begin, size_t begin_x) size_t *match_len, bool skipone, const filestruct *begin, size_t begin_x)
{ {
size_t found_len = strlen(needle); size_t found_len = strlen(needle);
@ -304,7 +304,7 @@ int findnextstr(const char *needle, bool whole_word_only, bool have_region,
/* If we've reached the start or end of the buffer, wrap around; /* If we've reached the start or end of the buffer, wrap around;
* but stop when spell-checking or replacing in a region. */ * but stop when spell-checking or replacing in a region. */
if (line == NULL) { if (line == NULL) {
if (whole_word_only || have_region) { if (whole_word_only || modus == INREGION) {
enable_waiting(); enable_waiting();
return 0; return 0;
} }
@ -314,9 +314,11 @@ int findnextstr(const char *needle, bool whole_word_only, bool have_region,
else else
line = openfile->fileage; line = openfile->fileage;
statusbar(_("Search Wrapped")); if (modus == JUSTFIND) {
/* Delay the "Searching..." message for at least two seconds. */ statusbar(_("Search Wrapped"));
feedback = -2; /* Delay the "Searching..." message for at least two seconds. */
feedback = -2;
}
} }
/* If we've reached the original starting line, take note. */ /* If we've reached the original starting line, take note. */
@ -437,7 +439,7 @@ void go_looking(void)
came_full_circle = FALSE; came_full_circle = FALSE;
didfind = findnextstr(last_search, FALSE, FALSE, NULL, FALSE, didfind = findnextstr(last_search, FALSE, JUSTFIND, NULL, FALSE,
openfile->current, openfile->current_x); openfile->current, openfile->current_x);
/* If we found something, and we're back at the exact same spot /* If we found something, and we're back at the exact same spot
@ -548,21 +550,21 @@ ssize_t do_replace_loop(const char *needle, bool whole_word_only,
size_t match_len; size_t match_len;
bool replaceall = FALSE; bool replaceall = FALSE;
bool skipone = FALSE; bool skipone = FALSE;
bool mark_was_set = FALSE; int modus = REPLACING;
#ifndef NANO_TINY #ifndef NANO_TINY
filestruct *top, *bot; filestruct *top, *bot;
size_t top_x, bot_x; size_t top_x, bot_x;
bool mark_was_set = openfile->mark_set;
bool right_side_up = FALSE; bool right_side_up = FALSE;
/* TRUE if (mark_begin, mark_begin_x) is the top of the mark, /* TRUE if (mark_begin, mark_begin_x) is the top of the mark,
* FALSE if (current, current_x) is. */ * FALSE if (current, current_x) is. */
mark_was_set = openfile->mark_set;
/* If the mark is on, frame the region, and turn the mark off. */ /* If the mark is on, frame the region, and turn the mark off. */
if (mark_was_set) { if (mark_was_set) {
mark_order((const filestruct **)&top, &top_x, mark_order((const filestruct **)&top, &top_x,
(const filestruct **)&bot, &bot_x, &right_side_up); (const filestruct **)&bot, &bot_x, &right_side_up);
openfile->mark_set = FALSE; openfile->mark_set = FALSE;
modus = INREGION;
/* Start either at the top or the bottom of the marked region. */ /* Start either at the top or the bottom of the marked region. */
if (!ISSET(BACKWARDS_SEARCH)) { if (!ISSET(BACKWARDS_SEARCH)) {
@ -579,7 +581,7 @@ ssize_t do_replace_loop(const char *needle, bool whole_word_only,
while (TRUE) { while (TRUE) {
int i = 0; int i = 0;
int result = findnextstr(needle, whole_word_only, mark_was_set, int result = findnextstr(needle, whole_word_only, modus,
&match_len, skipone, real_current, *real_current_x); &match_len, skipone, real_current, *real_current_x);
/* If nothing more was found, or the user aborted, stop looping. */ /* If nothing more was found, or the user aborted, stop looping. */

2
src/text.c
View File

@ -2619,7 +2619,7 @@ bool do_int_spell_fix(const char *word)
} }
/* Find the first whole occurrence of word. */ /* Find the first whole occurrence of word. */
result = findnextstr(word, TRUE, TRUE, NULL, FALSE, NULL, 0); result = findnextstr(word, TRUE, INREGION, NULL, FALSE, NULL, 0);
/* If the word isn't found, alert the user; if it is, allow correction. */ /* If the word isn't found, alert the user; if it is, allow correction. */
if (result == 0) { if (result == 0) {