nano

commit 78d644a635ab300fc039ddac97ab86451da3a554
parent 1c293d2e284f296a185a378f20cab25b58fe03fe
Author: David Lawrence Ramsey <pooka109@gmail.com>
Date:   Fri,  5 Nov 2004 16:24:35 +0000

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

Diffstat:
M
ChangeLog
 | 
3
+++
M
src/files.c
 | 
8
++++++++

2 files changed, 11 insertions(+), 0 deletions(-)
diff --git a/ChangeLog b/ChangeLog
@@ -118,6 +118,9 @@ CVS code -
   read_file()
 	- Rename variable fileformat to format, to avoid confusion with
 	  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()
 	- Simplify by reusing variables whereever possible, and add a
 	  parameter execute to indicate whether or not to be in "Execute
diff --git a/src/files.c b/src/files.c
@@ -466,7 +466,15 @@ void load_buffer(const char *name)
     }
 
     if (rc == 0) {
+	file_format fmt_save = fmt;
+
 	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
 	stat(filename, &originalfilestat);
 #endif