From: David Lawrence Ramsey <pooka109@gmail.com>
Date: Tue, 23 Sep 2003 04:25:05 +0000 (+0000)
Subject: set fileformat back to 0 after reading in a file to prevent erroneous
X-Git-Tag: v1.3.0~17
X-Git-Url: https://git.wh0rd.org/?a=commitdiff_plain;h=7bf00de84fe532d25b058e31e84b27f9b59f6a1e;p=nano.git

set fileformat back to 0 after reading in a file to prevent erroneous
conversion messages from showing up when we read in more files


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

diff --git a/ChangeLog b/ChangeLog
index 581d759d..4934b02d 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -55,6 +55,10 @@ CVS code -
 	- Convert memmove() function calls to charmove() macro calls, as
 	  the former all work on char*'s. (DLR)
 - files.c:
+  read_file()
+	- After we've read in a file and possibly converted it from
+	  DOS/Mac format, set fileformat back to 0 to prevent erroneous
+	  conversion messages when we read other files in. (DLR)
   do_browser()
 	- Some of the Pico compatibility options in the file browser
 	  that don't work properly for current Pico have been removed.
diff --git a/src/files.c b/src/files.c
index 309b82d7..b3ce36a7 100644
--- a/src/files.c
+++ b/src/files.c
@@ -326,6 +326,12 @@ int read_file(FILE *f, const char *filename, int quiet)
 	statusbar(P_("Read %d line", "Read %d lines", num_lines),
 			num_lines);
 
+#ifndef NANO_SMALL
+    /* Set fileformat back to 0, now that we've read the file in and
+       possibly converted it from DOS/Mac format. */
+    fileformat = 0;
+#endif
+
     totlines += num_lines;
 
     return 1;