From: Chris Allegretta <chrisa@asty.org>
Date: Sat, 16 Sep 2000 05:25:06 +0000 (+0000)
Subject: Fix bug #44 by Rocco Corsi
X-Git-Tag: v0.9.18~2
X-Git-Url: https://git.wh0rd.org/?a=commitdiff_plain;h=f45c18daa0113841186d78a4f87e25c7773ed0ba;p=nano.git

Fix bug #44 by Rocco Corsi


git-svn-id: svn://svn.savannah.gnu.org/nano/trunk/nano@224 35c25a1d-7b9e-4130-9fde-d3aeb78583b8
---

diff --git a/BUGS b/BUGS
index 918c9dc7..b671f1e7 100644
--- a/BUGS
+++ b/BUGS
@@ -62,6 +62,9 @@
 - Unable to cut the entire file using the marker (discovered by Kev Tyler)
   (42). [FIXED]
 - The keypad does not work when nano runs in the Gnome terminal (43). [FIXED]
+- When reading in a file, if the file is a directory the contents of the
+  file being edited are blown away (discovered by  Chris Pimlot) (44). [FIXED]
+
 ** Open BUGS **
 
 - Marked cutting sometimes leaves a newline in the file unintelligently,
@@ -74,4 +77,3 @@
 - totsize problems still abound in do_justify (33)
 
 $Id$
-
diff --git a/ChangeLog b/ChangeLog
index 982d757c..f0b9077e 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -9,6 +9,9 @@ CVS code -
   do_cut_text()
 	- Don't immediately abort if we're on filebot and the marker is
 	  set (fixes bug #42).
+- files.c:
+  open_file()
+	- Fix for bug #44 (Rocco Corsi).
 - global.c:
   shortcut_init()
 	- Added in FKEYs that for some reason were left out.  *boggle*
diff --git a/files.c b/files.c
index 8a6cd9d2..f06daa09 100644
--- a/files.c
+++ b/files.c
@@ -228,7 +228,8 @@ int open_file(char *filename, int insert, int quiet)
     } else {			/* File is A-OK */
 	if (S_ISDIR(fileinfo.st_mode)) {
 	    statusbar(_("File \"%s\" is a directory"), filename);
-	    new_file();
+	    if (!insert)
+		new_file();
 	    return -1;
 	}
 	if (!quiet)