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

tweaks: adjust some indentation after the previous change 

Also reshuffle some arguments.
master
Benno Schulenberg 2019-05-08 19:32:30 +02:00
parent c338d86843
commit 4fb9f298c9
3 changed files with 19 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
src/search.c
View File

@ -95,13 +95,14 @@ void search_init(bool replacing, bool keep_the_answer)
/* Ask the user what to search for (or replace). */ /* Ask the user what to search for (or replace). */
int response = do_prompt(FALSE, FALSE, int response = do_prompt(FALSE, FALSE,
inhelp ? MFINDINHELP : (replacing ? MREPLACE : MWHEREIS), inhelp ? MFINDINHELP : (replacing ? MREPLACE : MWHEREIS),
answer, &search_history, answer, &search_history, edit_refresh,
/* TRANSLATORS: This is the main search prompt. */ /* TRANSLATORS: This is the main search prompt. */
edit_refresh, "%s%s%s%s%s%s", _("Search"), "%s%s%s%s%s%s", _("Search"),
/* TRANSLATORS: The next four modify the search prompt. */ /* TRANSLATORS: The next five modify the search prompt. */
ISSET(CASE_SENSITIVE) ? _(" [Case Sensitive]") : "", ISSET(CASE_SENSITIVE) ? _(" [Case Sensitive]") : "",
ISSET(USE_REGEXP) ? _(" [Regexp]") : "", ISSET(USE_REGEXP) ? _(" [Regexp]") : "",
ISSET(BACKWARDS_SEARCH) ? _(" [Backwards]") : "", replacing ? ISSET(BACKWARDS_SEARCH) ? _(" [Backwards]") : "",
replacing ?
#ifndef NANO_TINY #ifndef NANO_TINY
openfile->mark ? _(" (to replace) in selection") : openfile->mark ? _(" (to replace) in selection") :
#endif #endif
@ -686,9 +687,9 @@ void ask_for_replacement(void)
linestruct *edittop_save, *begin; linestruct *edittop_save, *begin;
size_t firstcolumn_save, begin_x; size_t firstcolumn_save, begin_x;
ssize_t numreplaced; ssize_t numreplaced;
int response = do_prompt(FALSE, FALSE, MREPLACEWITH, NULL, &replace_history, int response = do_prompt(FALSE, FALSE, MREPLACEWITH, NULL,
/* TRANSLATORS: This is a prompt. */ /* TRANSLATORS: This is a prompt. */
edit_refresh, _("Replace with")); &replace_history, edit_refresh, _("Replace with"));
#ifdef ENABLE_HISTORIES #ifdef ENABLE_HISTORIES
/* If the replace string is not "", add it to the replace history list. */ /* If the replace string is not "", add it to the replace history list. */
@ -745,9 +746,9 @@ void do_gotolinecolumn(ssize_t line, ssize_t column, bool use_answer,
if (interactive) { if (interactive) {
/* Ask for the line and column. */ /* Ask for the line and column. */
int response = do_prompt(FALSE, FALSE, MGOTOLINE, int response = do_prompt(FALSE, FALSE, MGOTOLINE,
use_answer ? answer : NULL, NULL, use_answer ? answer : NULL, NULL, edit_refresh,
/* TRANSLATORS: This is a prompt. */ /* TRANSLATORS: This is a prompt. */
edit_refresh, _("Enter line number, column number")); _("Enter line number, column number"));
/* If the user cancelled or gave a blank answer, get out. */ /* If the user cancelled or gave a blank answer, get out. */
if (response < 0) { if (response < 0) {