ariadne
/
smol
2
1
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

don't change the file format when we insert another file into the 

current one


git-svn-id: svn://svn.savannah.gnu.org/nano/trunk/nano@2066 35c25a1d-7b9e-4130-9fde-d3aeb78583b8
master
David Lawrence Ramsey 2004-11-05 16:24:35 +00:00
parent 1c293d2e28
commit 78d644a635
2 changed files with 11 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
ChangeLog
View File

@ -118,6 +118,9 @@ CVS code -
read_file() read_file()
- Rename variable fileformat to format, to avoid confusion with - Rename variable fileformat to format, to avoid confusion with
the file_format enum type. (DLR) the file_format enum type. (DLR)
load_buffer()
- Don't change the file format when we insert another file into
the current one. (DLR)
do_insertfile() do_insertfile()
- Simplify by reusing variables whereever possible, and add a - Simplify by reusing variables whereever possible, and add a
parameter execute to indicate whether or not to be in "Execute parameter execute to indicate whether or not to be in "Execute

8
src/files.c
View File

@ -466,7 +466,15 @@ void load_buffer(const char *name)
} }
if (rc == 0) { if (rc == 0) {
file_format fmt_save = fmt;
read_file(f, filename); read_file(f, filename);
/* If we're not loading into a new buffer, preserve the file
* format. */
if (!new_buffer)
fmt = fmt_save;
#ifndef NANO_SMALL #ifndef NANO_SMALL
stat(filename, &originalfilestat); stat(filename, &originalfilestat);
#endif #endif