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 581d759d92b2ee8ac2682e8036336033f79963d7..4934b02d275418d42fcf9c93ee8b851693174f45 100644 (file)
--- 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 309b82d7495be17c84bbd4fcc62ec073ddd6532d..b3ce36a7144c336fac1970e7c43ba65f86a8a01f 100644 (file)
--- 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;