X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2Fbuffer_funcs.cpp;h=9e1b048cc01785799fe1b7fe0b7867abcd0110bd;hb=2e433654c7f3db02bfd0e4dd09eb04cd8ab44bb9;hp=03ecc90abeb9d9a8bea5c4ec654ac38fde923016;hpb=5c431b9335e7e698f866f516665a2c604e7be396;p=lyx.git

diff --git a/src/buffer_funcs.cpp b/src/buffer_funcs.cpp
index 03ecc90abe..9e1b048cc0 100644
--- a/src/buffer_funcs.cpp
+++ b/src/buffer_funcs.cpp
@@ -95,12 +95,18 @@ Buffer * checkAndLoadLyXFile(FileName const & filename, bool const acceptDirty)
 	bool const exists = filename.exists();
 	bool const tryVC = exists ? false : LyXVC::fileInVC(filename);
 	if (exists || tryVC) {
-		if (exists && !filename.isReadableFile()) {
-			docstring text = bformat(_("The file %1$s exists but is not "
-				"readable by the current user."),
-				from_utf8(filename.absFileName()));
-			Alert::error(_("File not readable!"), text);
-			return 0;
+		if (exists) {
+			if (!filename.isReadableFile()) {
+				docstring text = bformat(_("The file %1$s exists but is not "
+					"readable by the current user."),
+					from_utf8(filename.absFileName()));
+				Alert::error(_("File not readable!"), text);
+				return 0;
+			}
+			if (filename.extension() == "lyx" && filename.isFileEmpty()) {
+				// Makes it possible to open an empty (0 bytes) .lyx file
+				return newFile(filename.absFileName(), "", true);
+			}
 		}
 		Buffer * b = theBufferList().newBuffer(filename.absFileName());
 		if (!b) {
@@ -120,7 +126,7 @@ Buffer * checkAndLoadLyXFile(FileName const & filename, bool const acceptDirty)
 		"exist.\n\nDo you want to create a new document?"),
 		from_utf8(filename.absFileName()));
 	if (!Alert::prompt(_("Create new document?"),
-			text, 0, 1, _("&Create"), _("Cancel")))
+			text, 0, 1, _("&Yes, Create New Document"), _("&No, Do Not Create")))
 		return newFile(filename.absFileName(), string(), true);
 
 	return 0;
@@ -180,11 +186,11 @@ Buffer * newUnnamedFile(FileName const & path, string const & prefix,
 	FileName filename;
 
 	do {
-		filename.set(path, 
+		filename.set(path,
 			prefix + convert<string>(++file_number[prefix]) + ".lyx");
 	}
 	while (theBufferList().exists(filename) || filename.isReadableFile());
-		
+
 	return newFile(filename.absFileName(), templatename, false);
 }