X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2Fbuffer_funcs.cpp;h=85a22ebff756827a13eae8f13d79052680d48a65;hb=4db3e641ed6765e005343010cb90ee8af26f8f99;hp=5b972e5e0af210044a6085e03c7ab56a79976523;hpb=75773f3c2257bfc273ba3f5a180ec76ba98954ee;p=lyx.git

diff --git a/src/buffer_funcs.cpp b/src/buffer_funcs.cpp
index 5b972e5e0a..85a22ebff7 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"
@@ -75,14 +76,16 @@ Buffer * checkAndLoadLyXFile(FileName const & filename, bool const acceptDirty)
 		if (!Alert::prompt(_("Reload saved document?"),
 			  text, 0, 1,  _("&Reload"), _("&Keep Changes"))) {
 			// reload the document
-			if (!checkBuffer->reload())
+			if (checkBuffer->reload() != Buffer::ReadSuccess)
 				return 0;
 		}
 		return checkBuffer;
 	}
 
-	if (filename.exists()) {
-		if (!filename.isReadableFile()) {
+	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()));
@@ -94,7 +97,7 @@ Buffer * checkAndLoadLyXFile(FileName const & filename, bool const acceptDirty)
 			// Buffer creation is not possible.
 			return 0;
 		}
-		if (b->loadLyXFile(filename) != Buffer::ReadSuccess) {
+		if (b->loadLyXFile() != Buffer::ReadSuccess) {
 			// do not save an emergency file when releasing the buffer
 			b->markClean();
 			theBufferList().release(b);
@@ -116,7 +119,7 @@ Buffer * checkAndLoadLyXFile(FileName const & filename, bool const acceptDirty)
 
 // FIXME newFile() should probably be a member method of Application...
 Buffer * newFile(string const & filename, string const & templatename,
-		 bool const isNamed)
+		 bool is_named)
 {
 	// get a free buffer
 	Buffer * b = theBufferList().newBuffer(filename);
@@ -132,7 +135,7 @@ Buffer * newFile(string const & filename, string const & templatename,
 		tname = makeAbsPath(templatename);
 
 	if (!tname.empty()) {
-		if (!b->readFile(tname)) {
+		if (b->loadThisLyXFile(tname) != Buffer::ReadSuccess) {
 			docstring const file = makeDisplayPath(tname.absFileName(), 50);
 			docstring const text  = bformat(
 				_("The specified document template\n%1$s\ncould not be read."),
@@ -143,13 +146,12 @@ Buffer * newFile(string const & filename, string const & templatename,
 		}
 	}
 
-	if (!isNamed) {
-		b->setUnnamed();
-		b->setFileName(filename);
-	} else
-		// in this case, the user chose the filename, so we assume that she
-		// really does want this file.
+	if (is_named)
+		// in this case, the user chose the filename, so we
+		// assume that she really does want this file.
 		b->markDirty();
+	else
+		b->setUnnamed();
 
 	b->setReadonly(false);
 	b->setFullyLoaded(true);
@@ -175,92 +177,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)
- */
-int countWords(DocIterator const & from, DocIterator const & to)
-{
-	int count = 0;
-	bool inword = false;
-	for (DocIterator dit = from ; dit != to ; ) {
-		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() && !par.isDeleted(pos)) {
-			Inset const * ins = par.getInset(pos);
-			if (ins && !ins->producesOutput()) {
-				//skip this inset
-				++dit.top().pos();
-				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());
@@ -268,7 +189,7 @@ Buffer * loadIfNeeded(FileName const & fname)
 			// Buffer creation is not possible.
 			return 0;
 
-		if (buffer->loadLyXFile(fname) != Buffer::ReadSuccess) {
+		if (buffer->loadLyXFile() != Buffer::ReadSuccess) {
 			//close the buffer we just opened
 			theBufferList().release(buffer);
 			return 0;