tweaks: improve some indentation and reshuffle a few lines

master
Benno Schulenberg 2016-08-26 12:18:04 +02:00
parent 7e0c4e5726
commit b77b1391c3
4 changed files with 36 additions and 36 deletions

View File

@ -1085,21 +1085,21 @@ void do_insertfile(
while (TRUE) {
#ifndef NANO_TINY
if (execute) {
msg =
#ifndef DISABLE_MULTIBUFFER
ISSET(MULTIBUFFER) ?
_("Command to execute in new buffer [from %s] ") :
if (ISSET(MULTIBUFFER))
msg = _("Command to execute in new buffer [from %s] ");
else
#endif
_("Command to execute [from %s] ");
msg = _("Command to execute [from %s] ");
} else
#endif /* NANO_TINY */
{
msg =
#ifndef DISABLE_MULTIBUFFER
ISSET(MULTIBUFFER) ?
_("File to insert into new buffer [from %s] ") :
if (ISSET(MULTIBUFFER))
msg = _("File to insert into new buffer [from %s] ");
else
#endif
_("File to insert [from %s] ");
msg = _("File to insert [from %s] ");
}
present_path = mallocstrcpy(present_path, "./");
@ -1117,8 +1117,8 @@ void do_insertfile(
#endif
edit_refresh, msg,
#ifndef DISABLE_OPERATINGDIR
operating_dir != NULL && strcmp(operating_dir,
".") != 0 ? operating_dir :
operating_dir != NULL && strcmp(operating_dir, ".") != 0 ?
operating_dir :
#endif
"./");

View File

@ -546,7 +546,7 @@ functionptrtype acquire_an_answer(int *actual, bool allow_tabs,
}
#ifdef DEBUG
fprintf(stderr, "acquire_an_answer: answer = \"%s\", statusbar_x = %lu\n", answer, (unsigned long) statusbar_x);
fprintf(stderr, "acquiring: answer = \"%s\", statusbar_x = %lu\n", answer, (unsigned long) statusbar_x);
#endif
update_the_statusbar();
@ -709,7 +709,7 @@ int do_prompt(bool allow_tabs,
{
va_list ap;
int retval = KEY_WINCH;
functionptrtype func;
functionptrtype func = NULL;
#ifndef DISABLE_TABCOMP
bool listed = FALSE;
#endif

View File

@ -164,7 +164,7 @@ int search_init(bool replacing, bool use_answer)
/* TRANSLATORS: This is the main search prompt. */
edit_refresh, "%s%s%s%s%s%s", _("Search"),
#ifndef NANO_TINY
/* TRANSLATORS: The next three strings are modifiers of the search prompt. */
/* TRANSLATORS: The next three modify the search prompt. */
ISSET(CASE_SENSITIVE) ? _(" [Case Sensitive]") :
#endif
"",
@ -177,7 +177,7 @@ int search_init(bool replacing, bool use_answer)
#endif
"", replacing ?
#ifndef NANO_TINY
/* TRANSLATORS: The next two strings are modifiers of the search prompt. */
/* TRANSLATORS: The next two modify the search prompt. */
openfile->mark_set ? _(" (to replace) in selection") :
#endif
_(" (to replace)") : "", buf);