nano

commit 964771afc3b804000ddba3cc3f0fe959b8ad6a2b
parent fe94999c1c97943dd98bb11fc4d274bf130b09f8
Author: Benno Schulenberg <bensberg@telfort.nl>
Date:   Wed, 13 May 2020 11:11:24 +0200

tweaks: reshuffle a condition, for symmetry

Diffstat:
M
src/files.c
 | 
4
++--

1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/src/files.c b/src/files.c
@@ -686,8 +686,8 @@ void read_file(FILE *f, int fd, const char *filename, bool undoable)
 					format = 1;
 				len--;
 			}
-		} else if ((num_lines == 0 || format == 2) && !ISSET(NO_CONVERT) &&
-										len > 0 && buf[len - 1] == '\r') {
+		} else if ((num_lines == 0 || format == 2) &&
+					len > 0 && buf[len - 1] == '\r' && !ISSET(NO_CONVERT)) {
 			format = 2;
 			len--;
 #endif