From 4fb9f298c970efb92b7d5f8c5c8d165f8982e8f4 Mon Sep 17 00:00:00 2001 From: Benno Schulenberg Date: Wed, 8 May 2019 19:32:30 +0200 Subject: [PATCH] tweaks: adjust some indentation after the previous change Also reshuffle some arguments. --- src/browser.c | 4 ++-- src/files.c | 12 ++++++------ src/search.c | 21 +++++++++++---------- 3 files changed, 19 insertions(+), 18 deletions(-) diff --git a/src/browser.c b/src/browser.c index 63012369..f8904855 100644 --- a/src/browser.c +++ b/src/browser.c @@ -224,8 +224,8 @@ char *do_browser(char *path) } else if (func == goto_dir_void) { /* Ask for the directory to go to. */ if (do_prompt(TRUE, FALSE, MGOTODIR, NULL, NULL, - /* TRANSLATORS: This is a prompt. */ - browser_refresh, _("Go To Directory")) < 0) { + /* TRANSLATORS: This is a prompt. */ + browser_refresh, _("Go To Directory")) < 0) { statusbar(_("Cancelled")); continue; } diff --git a/src/files.c b/src/files.c index ce05a4e0..b9d894f3 100644 --- a/src/files.c +++ b/src/files.c @@ -1123,17 +1123,17 @@ void do_insertfile(void) response = do_prompt(TRUE, TRUE, #ifndef NANO_TINY - execute ? MEXTCMD : + execute ? MEXTCMD : #endif - MINSERTFILE, given, + MINSERTFILE, given, #ifndef NANO_TINY - execute ? &execute_history : + execute ? &execute_history : #endif - NULL, edit_refresh, msg, + NULL, edit_refresh, msg, #ifdef ENABLE_OPERATINGDIR - operating_dir != NULL ? operating_dir : + operating_dir != NULL ? operating_dir : #endif - "./"); + "./"); /* If we're in multibuffer mode and the filename or command is * blank, open a new buffer instead of canceling. */ diff --git a/src/search.c b/src/search.c index 51bbd4a0..4bd6236c 100644 --- a/src/search.c +++ b/src/search.c @@ -95,13 +95,14 @@ void search_init(bool replacing, bool keep_the_answer) /* Ask the user what to search for (or replace). */ int response = do_prompt(FALSE, FALSE, inhelp ? MFINDINHELP : (replacing ? MREPLACE : MWHEREIS), - answer, &search_history, + answer, &search_history, edit_refresh, /* TRANSLATORS: This is the main search prompt. */ - edit_refresh, "%s%s%s%s%s%s", _("Search"), - /* TRANSLATORS: The next four modify the search prompt. */ + "%s%s%s%s%s%s", _("Search"), + /* TRANSLATORS: The next five modify the search prompt. */ ISSET(CASE_SENSITIVE) ? _(" [Case Sensitive]") : "", ISSET(USE_REGEXP) ? _(" [Regexp]") : "", - ISSET(BACKWARDS_SEARCH) ? _(" [Backwards]") : "", replacing ? + ISSET(BACKWARDS_SEARCH) ? _(" [Backwards]") : "", + replacing ? #ifndef NANO_TINY openfile->mark ? _(" (to replace) in selection") : #endif @@ -686,9 +687,9 @@ void ask_for_replacement(void) linestruct *edittop_save, *begin; size_t firstcolumn_save, begin_x; ssize_t numreplaced; - int response = do_prompt(FALSE, FALSE, MREPLACEWITH, NULL, &replace_history, - /* TRANSLATORS: This is a prompt. */ - edit_refresh, _("Replace with")); + int response = do_prompt(FALSE, FALSE, MREPLACEWITH, NULL, + /* TRANSLATORS: This is a prompt. */ + &replace_history, edit_refresh, _("Replace with")); #ifdef ENABLE_HISTORIES /* 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) { /* Ask for the line and column. */ int response = do_prompt(FALSE, FALSE, MGOTOLINE, - use_answer ? answer : NULL, NULL, - /* TRANSLATORS: This is a prompt. */ - edit_refresh, _("Enter line number, column number")); + use_answer ? answer : NULL, NULL, edit_refresh, + /* TRANSLATORS: This is a prompt. */ + _("Enter line number, column number")); /* If the user cancelled or gave a blank answer, get out. */ if (response < 0) {