nano

commit 7bf00de84fe532d25b058e31e84b27f9b59f6a1e
parent a3831ab2b87da2d5c81b06abb431ba3a3dc54de2
Author: David Lawrence Ramsey <pooka109@gmail.com>
Date:   Tue, 23 Sep 2003 04:25:05 +0000

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

Diffstat:
M
ChangeLog
 | 
4
++++
M
src/files.c
 | 
6
++++++

2 files changed, 10 insertions(+), 0 deletions(-)
diff --git 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
@@ -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;