X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2Fbuffer_funcs.cpp;h=beab239fc31215dda29f21e2c7f4e9df803dd5e2;hb=28be7d552f62cc02fa86d7f79201d089bfb2d7b5;hp=ff4512b5c6a1279774f434f957140bd294ad90cd;hpb=291c5c91ecb49006b92d9972f4be61347e54b70a;p=lyx.git

diff --git a/src/buffer_funcs.cpp b/src/buffer_funcs.cpp
index ff4512b5c6..beab239fc3 100644
--- a/src/buffer_funcs.cpp
+++ b/src/buffer_funcs.cpp
@@ -26,6 +26,7 @@
 #include "LaTeX.h"
 #include "Layout.h"
 #include "LyX.h"
+#include "LyXVC.h"
 #include "TextClass.h"
 #include "Paragraph.h"
 #include "ParagraphList.h"
@@ -46,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;
@@ -72,22 +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, 0, 1,  _("&Reload"), _("&Keep Changes"))) {
-			// 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;
 	}
 
-	if (filename.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;
+	bool const exists = filename.exists();
+	bool const tryVC = exists ? false : LyXVC::fileInVC(filename);
+	if (exists || tryVC) {
+		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) {
@@ -161,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 {
@@ -174,104 +195,11 @@ Buffer * newUnnamedFile(FileName const & path, string const & prefix,
 }
 
 
-/* 
- * FIXME : merge with countChars. The structures of the two functions
- * are similar but, unfortunately, they seem to have a different
- * notion of what to count. Since nobody ever complained about that,
- * this proves (again) that any number beats no number ! (JMarc)
- * We have two use cases:
- * 1. Count the words of the given range for document statistics
- * - ignore inset content without output. (skipNoOutput == true)
- * 2. Count the words to present a progress bar for the spell checker
- * - has to count whole content. (skipNoOutput == false)
- */
-int countWords(DocIterator const & from, DocIterator const & to,
-			   bool skipNoOutput)
-{
-	int count = 0;
-	bool inword = false;
-	
-	for (DocIterator dit = from ; dit != to && !dit.atEnd(); ) {
-		if (!dit.inTexted()) {
-			dit.forwardPos();
-			continue;
-		}
-		
-		Paragraph const & par = dit.paragraph();
-		pos_type const pos = dit.pos();
-
-		// Copied and adapted from isWordSeparator() in Paragraph
-		if (pos == dit.lastpos()) {
-			inword = false;
-		} else if (!par.isDeleted(pos)) {
-			Inset const * ins = par.getInset(pos);
-			if (ins && skipNoOutput && !ins->producesOutput()) {
-				// skip this inset
-				++dit.top().pos();
-				// stop if end of range was skipped
-				if (!to.atEnd() && dit >= to)
-					break;
-				continue;
-			}
-			if (par.isWordSeparator(pos)) 
-				inword = false;
-			else if (!inword) {
-				++count;
-				inword = true;
-			}
-		}
-		dit.forwardPos();
-	}
-
-	return count;
-}
-
-
-int countChars(DocIterator const & from, DocIterator const & to, 
-	       bool with_blanks)
-{
-	int chars = 0;
-	int blanks = 0;
-	for (DocIterator dit = from ; dit != to ; ) {
-		if (!dit.inTexted()) {
-			dit.forwardPos();
-			continue;
-		}
-		
-		Paragraph const & par = dit.paragraph();
-		pos_type const pos = dit.pos();
-		
-		if (pos != dit.lastpos() && !par.isDeleted(pos)) {
-			if (Inset const * ins = par.getInset(pos)) {
-				if (!ins->producesOutput()) {
-					//skip this inset
-					++dit.top().pos();
-					continue;
-				}
-				if (ins->isLetter())
-					++chars;
-				else if (with_blanks && ins->isSpace())
-					++blanks;
-			} else {
-				char_type const c = par.getChar(pos);
-				if (isPrintableNonspace(c))
-					++chars;
-				else if (isSpace(c) && with_blanks)
-					++blanks;
-			}
-		}
-		dit.forwardPos();
-	}
-
-	return chars + blanks;
-}
-
-
 Buffer * loadIfNeeded(FileName const & fname)
 {
 	Buffer * buffer = theBufferList().getBuffer(fname);
 	if (!buffer) {
-		if (!fname.exists())
+		if (!fname.exists() && !LyXVC::fileInVC(fname))
 			return 0;
 
 		buffer = theBufferList().newBuffer(fname.absFileName());