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
master
David Lawrence Ramsey 2003-09-23 04:25:05 +00:00
parent a3831ab2b8
commit 7bf00de84f
2 changed files with 10 additions and 0 deletions

View File

@ -55,6 +55,10 @@ CVS code -
- Convert memmove() function calls to charmove() macro calls, as - Convert memmove() function calls to charmove() macro calls, as
the former all work on char*'s. (DLR) the former all work on char*'s. (DLR)
- files.c: - 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() do_browser()
- Some of the Pico compatibility options in the file browser - Some of the Pico compatibility options in the file browser
that don't work properly for current Pico have been removed. that don't work properly for current Pico have been removed.

View File

@ -326,6 +326,12 @@ int read_file(FILE *f, const char *filename, int quiet)
statusbar(P_("Read %d line", "Read %d lines", num_lines), statusbar(P_("Read %d line", "Read %d lines", num_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; totlines += num_lines;
return 1; return 1;