Account for old versions of Pygments

[lyx.git] / src / buffer_funcs.cpp

diff --git a/src/buffer_funcs.cpp b/src/buffer_funcs.cpp
index 431c87fc45d21a700fc9fea1caecc950041efb0a..beab239fc31215dda29f21e2c7f4e9df803dd5e2 100644 (file)
--- a/src/buffer_funcs.cpp
+++ b/src/buffer_funcs.cpp
@@ -47,6 +47,7 @@
 #include "support/filetools.h"
 #include "support/gettext.h"
 #include "support/lstrings.h"
+#include "support/mutex.h"
 #include "support/textutils.h"
 
 using namespace std;
@@ -73,24 +74,39 @@ Buffer * checkAndLoadLyXFile(FileName const & filename, bool const acceptDirty)
                docstring const text = bformat(_(
                                "The document %1$s is already loaded and has unsaved changes.\n"
                                "Do you want to abandon your changes and reload the version on disk?"), file);
-               if (!Alert::prompt(_("Reload saved document?"),
-                         text, 1, 1,  _("&Reload"), _("&Cancel"))) {
-                       // reload the document
-                       if (checkBuffer->reload() != Buffer::ReadSuccess)
+               int res = Alert::prompt(_("Reload saved document?"),
+                                       text, 2, 2,  _("Yes, &Reload"), _("No, &Keep Changes"), _("&Cancel"));
+               switch (res) {
+                       case 0: {
+                               // reload the document
+                               if (checkBuffer->reload() != Buffer::ReadSuccess)
+                                       return 0;
+                               return checkBuffer;
+                       }
+                       case 1:
+                               // keep changes
+                               return checkBuffer;
+                       case 2:
+                               // cancel
                                return 0;
                }
-               return checkBuffer;
        }
 
        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) {
@@ -164,7 +180,9 @@ Buffer * newUnnamedFile(FileName const & path, string const & prefix,
                                                string const & templatename)
 {
        static map<string, int> file_number;
+       static Mutex mutex;
 
+       Mutex::Locker locker(&mutex);
        FileName filename;
 
        do {