From 8db42023bb53e11ccbe3a9727cbe1f3fb247d830 Mon Sep 17 00:00:00 2001 From: Benno Schulenberg Date: Mon, 12 Apr 2021 14:50:04 +0200 Subject: [PATCH] files: when Mac format has been detected, stay with it This fixes https://savannah.gnu.org/bugs/?60382. Bug existed since commit 09b919a6 from three weeks ago. --- src/files.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/files.c b/src/files.c index ffa05b25..07886c1f 100644 --- a/src/files.c +++ b/src/files.c @@ -699,7 +699,7 @@ void read_file(FILE *f, int fd, const char *filename, bool undoable) format = DOS_FILE; len--; } - } else if ((num_lines == 0 || format == 2) && + } else if ((num_lines == 0 || format == MAC_FILE) && len > 0 && buf[len - 1] == '\r' && !ISSET(NO_CONVERT)) { format = MAC_FILE; len--;