tweaks: reshuffle and trim a comment, and remove unneeded pair of braces

master
Benno Schulenberg 2020-06-21 09:18:24 +02:00
parent bb496bf456
commit 380589d95d
1 changed files with 4 additions and 6 deletions

View File

@ -2042,9 +2042,9 @@ int do_writeout(bool exiting, bool withprompt)
#endif #endif
while (TRUE) { while (TRUE) {
const char *msg;
int response = 0, choice = 0; int response = 0, choice = 0;
functionptrtype func; functionptrtype func;
const char *msg;
#ifndef NANO_TINY #ifndef NANO_TINY
const char *formatstr, *backupstr; const char *formatstr, *backupstr;
@ -2069,13 +2069,12 @@ int do_writeout(bool exiting, bool withprompt)
present_path = mallocstrcpy(present_path, "./"); present_path = mallocstrcpy(present_path, "./");
/* When we shouldn't prompt, use the existing filename. */ /* When we shouldn't prompt, use the existing filename.
* Otherwise, ask for (confirmation of) the filename. */
if ((!withprompt || (ISSET(SAVE_ON_EXIT) && exiting)) && if ((!withprompt || (ISSET(SAVE_ON_EXIT) && exiting)) &&
openfile->filename[0] != '\0') openfile->filename[0] != '\0')
answer = mallocstrcpy(answer, openfile->filename); answer = mallocstrcpy(answer, openfile->filename);
else { else
/* Ask for (confirmation of) the filename. Disable tab completion
* when in restricted mode. */
response = do_prompt(MWRITEFILE, given, NULL, response = do_prompt(MWRITEFILE, given, NULL,
edit_refresh, "%s%s%s", msg, edit_refresh, "%s%s%s", msg,
#ifndef NANO_TINY #ifndef NANO_TINY
@ -2084,7 +2083,6 @@ int do_writeout(bool exiting, bool withprompt)
"", "" "", ""
#endif #endif
); );
}
if (response < 0) { if (response < 0) {
statusbar(_("Cancelled")); statusbar(_("Cancelled"));