Allow LyX to open empty files (created, e.g., via "touch").

Patch from new contributor Jan Niklas Hasse.

(cherry picked from commit 0d77a7e3251aa7a971a365e3fa698ce9f26e2b9d)

diff --git a/lib/generate_contributions.py b/lib/generate_contributions.py
index 41c4961ca6df6557020a600fe04eba14213e7c20..50ad4dc1431456f06cf33b9707eb19efd2f66124 100755 (executable)
--- a/lib/generate_contributions.py
+++ b/lib/generate_contributions.py
@@ -827,6 +827,14 @@ contributors = [
                  "9 June 2015",
                  u"Haiku OS support"),
 
+     contributor(u"Jan Niklas Hasse",
+                 "jhasse () bixense ! com",
+                 "GPL",
+                 "Re: Patch to make it possible to open empty files",
+                 "m=148163124122780",
+                 "23 December 2016",
+                 u"File opening enhancement"),
+
      contributor(u"Richard Heck",
                  "rgheck () comcast ! net",
                  "GPL",

diff --git a/src/buffer_funcs.cpp b/src/buffer_funcs.cpp
index 03ecc90abeb9d9a8bea5c4ec654ac38fde923016..beab239fc31215dda29f21e2c7f4e9df803dd5e2 100644 (file)
--- 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) {