ariadne
/
smol
2
1
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

tweaks: condense two ifs to a single one

master
Benno Schulenberg 2017-01-06 10:56:39 +01:00
parent 4a1302ef55
commit 4223b83f75
1 changed files with 9 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
src/search.c
View File

@ -318,19 +318,16 @@ int findnextstr(const char *needle, bool whole_word_only, size_t *match_len,
} }
#endif #endif
#ifndef DISABLE_SPELLER #ifndef DISABLE_SPELLER
/* When we're spell checking, a match is only a true match when /* When we're spell checking, a match should be a separate word;
* it is a separate word. */ * if it's not, continue looking in the rest of the line. */
if (whole_word_only) { if (whole_word_only && !is_separate_word(found - line->data,
if (is_separate_word(found - line->data, found_len, line->data)) found_len, line->data)) {
break; from = found + move_mbright(found, 0);
else { continue;
/* Maybe there is a whole word in the rest of the line. */ }
from = found + move_mbright(found, 0);
continue;
}
} else
#endif #endif
break; /* The match is valid. */
break;
} }
/* If we're back at the beginning, then there is no needle. */ /* If we're back at the beginning, then there is no needle. */