LineageOS/android_external_nano
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

tweaks: put some conditions in a better order: the main one first

Browse Source
This commit is contained in:
Benno Schulenberg
2016-05-24 10:03:33 +02:00
parent e0e788e218
commit 619044e83d
1 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/files.c
View File

@@ -2250,7 +2250,7 @@ int do_writeout(bool exiting)
given = mallocstrcpy(NULL, given = mallocstrcpy(NULL,
#ifndef NANO_TINY #ifndef NANO_TINY
(!exiting && openfile->mark_set) ? "" : (openfile->mark_set && !exiting) ? "" :
#endif #endif
openfile->filename); openfile->filename);
@@ -2268,7 +2268,7 @@ int do_writeout(bool exiting)
* Selection to File" prompt. This function is disabled, since * Selection to File" prompt. This function is disabled, since
* it allows reading from or writing to files not specified on * it allows reading from or writing to files not specified on
* the command line. */ * the command line. */
if (!ISSET(RESTRICTED) && !exiting && openfile->mark_set) if (openfile->mark_set && !exiting && !ISSET(RESTRICTED))
msg = (append == PREPEND) ? _("Prepend Selection to File") : msg = (append == PREPEND) ? _("Prepend Selection to File") :
(append == APPEND) ? _("Append Selection to File") : (append == APPEND) ? _("Append Selection to File") :
_("Write Selection to File"); _("Write Selection to File");
@@ -2469,7 +2469,7 @@ int do_writeout(bool exiting)
* function is disabled, since it allows reading from or * function is disabled, since it allows reading from or
* writing to files not specified on the command line. */ * writing to files not specified on the command line. */
#ifndef NANO_TINY #ifndef NANO_TINY
if (!ISSET(RESTRICTED) && !exiting && openfile->mark_set) if (openfile->mark_set && !exiting && !ISSET(RESTRICTED))
result = write_marked_file(answer, NULL, FALSE, append); result = write_marked_file(answer, NULL, FALSE, append);
else else
#endif #endif