tweaks: split a variable into two, as they have different roles

master
Benno Schulenberg 2019-02-20 19:24:18 +01:00
parent 11a66d74b8
commit 0f9d60a386
1 changed files with 4 additions and 4 deletions

View File

@ -2101,7 +2101,7 @@ int do_writeout(bool exiting, bool withprompt)
while (TRUE) { while (TRUE) {
const char *msg; const char *msg;
int choice = 0; int response, choice;
functionptrtype func; functionptrtype func;
#ifndef NANO_TINY #ifndef NANO_TINY
const char *formatstr, *backupstr; const char *formatstr, *backupstr;
@ -2134,7 +2134,7 @@ int do_writeout(bool exiting, bool withprompt)
else { else {
/* Ask for (confirmation of) the filename. Disable tab completion /* Ask for (confirmation of) the filename. Disable tab completion
* when using restricted mode and the filename isn't blank. */ * when using restricted mode and the filename isn't blank. */
choice = do_prompt(!ISSET(RESTRICTED) || openfile->filename[0] == '\0', response = do_prompt(!ISSET(RESTRICTED) || openfile->filename[0] == '\0',
TRUE, MWRITEFILE, given, NULL, TRUE, MWRITEFILE, given, NULL,
edit_refresh, "%s%s%s", msg, edit_refresh, "%s%s%s", msg,
#ifndef NANO_TINY #ifndef NANO_TINY
@ -2145,12 +2145,12 @@ int do_writeout(bool exiting, bool withprompt)
); );
} }
if (choice < 0) { if (response < 0) {
statusbar(_("Cancelled")); statusbar(_("Cancelled"));
break; break;
} }
func = func_from_key(&choice); func = func_from_key(&response);
/* Upon request, abandon the buffer. */ /* Upon request, abandon the buffer. */
if (func == discard_buffer) { if (func == discard_buffer) {