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

tweaks: adjust a couple of comments

master
Benno Schulenberg 2016-07-27 09:23:49 +02:00
parent c88fae3310
commit f311c0af87
1 changed files with 8 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
src/search.c
View File

@ -600,14 +600,12 @@ char *replace_line(const char *needle)
return copy; return copy;
} }
/* Step through each replace word and prompt user before replacing. /* Step through each occurrence of the search string and prompt the user
* Parameters real_current and real_current_x are needed in order to * before replacing it. We seek for needle, and replace it with answer.
* The parameters real_current and real_current_x are needed in order to
* allow the cursor position to be updated when a word before the cursor * allow the cursor position to be updated when a word before the cursor
* is replaced by a shorter word. * is replaced by a shorter word. Return -1 if needle isn't found, -2 if
* * the seeking is aborted, else the number of replacements performed. */
* needle is the string to seek. We replace it with answer. Return -1
* if needle isn't found, else the number of replacements performed. If
* canceled isn't NULL, set it to TRUE if we canceled. */
ssize_t do_replace_loop( ssize_t do_replace_loop(
#ifndef DISABLE_SPELLER #ifndef DISABLE_SPELLER
bool whole_word_only, bool whole_word_only,
@ -626,8 +624,8 @@ ssize_t do_replace_loop(
/* 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. */
if (old_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 (old_mark_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;
@ -749,11 +747,9 @@ ssize_t do_replace_loop(
if (match_len == 0 || (*needle == '^' && ISSET(USE_REGEXP))) if (match_len == 0 || (*needle == '^' && ISSET(USE_REGEXP)))
match_len++; match_len++;
#endif #endif
/* Set the cursor at the last character of the replacement /* Set the cursor at the last character of the replacement
* text, so searching will resume after the replacement * text, so that searching will continue /after/ it. Note
* text. Note that current_x might be set to (size_t)-1 * that current_x might be set to (size_t)-1 here. */
* here. */
#ifndef NANO_TINY #ifndef NANO_TINY
if (!ISSET(BACKWARDS_SEARCH)) if (!ISSET(BACKWARDS_SEARCH))
#endif #endif