more miscellaneous minor fixes

git-svn-id: svn://svn.savannah.gnu.org/nano/trunk/nano@3999 35c25a1d-7b9e-4130-9fde-d3aeb78583b8

src/files.c

@@ -1906,11 +1906,10 @@ int do_writeout(bool exiting)
 		if (full_answer != NULL)
 		    free(full_answer);
 
-		if (different_name) {
 		if (name_exists) {
-			/* If we're using restricted mode, we aren't
-			 * allowed to save a new file under the name of
-			 * an existing file. */
+		    /* If we're using restricted mode, we aren't allowed
+		     * to save a new file under the name of an existing
+		     * file. */
 		    if (ISSET(RESTRICTED))
 			continue;
 
@@ -1918,11 +1917,11 @@ int do_writeout(bool exiting)
 			_("File exists, OVERWRITE ? "));
 		    if (i == 0 || i == -1)
 			continue;
-		    /* If we're using restricted mode, we aren't allowed
-		     * to change the name of a file once it has one,
-		     * because that would allow reading from or writing
-		     * to files not specified on the command line. */
-		    } else if (!ISSET(RESTRICTED) &&
+		/* If we're using restricted mode, we aren't allowed to
+		 * change the name of a file once it has one, because
+		 * that would allow reading from or writing to files not
+		 * specified on the command line. */
+		} else if (different_name && !ISSET(RESTRICTED) &&
 			openfile->filename[0] != '\0'
 #ifndef NANO_TINY
 			&& (exiting || !openfile->mark_set)
@@ -1934,7 +1933,6 @@ int do_writeout(bool exiting)
 			continue;
 		}
 	    }
-	    }
 
 	    /* Convert newlines to nulls, just before we save the
 	     * file. */