typo

[lyx.git] / src / buffer_funcs.cpp

diff --git a/src/buffer_funcs.cpp b/src/buffer_funcs.cpp
index c3f41c18ae024b93becfa50efb9b2ec370c40339..6b582b68024e82315136b0c70c9df817f6fd143f 100644 (file)
--- a/src/buffer_funcs.cpp
+++ b/src/buffer_funcs.cpp
@@ -61,12 +61,14 @@ Buffer * checkAndLoadLyXFile(FileName const & filename, bool const acceptDirty)
        // File already open?
        Buffer * checkBuffer = theBufferList().getBuffer(filename);
        if (checkBuffer) {
-               // sometimes (when setting the master buffer from a child)
+               // Sometimes (when setting the master buffer from a child)
                // we accept a dirty buffer right away (otherwise we'd get
-               // an infinite loop (bug 5514)
-               if (checkBuffer->isClean() || acceptDirty)
+               // an infinite loop (bug 5514).
+               // We also accept a dirty buffer when the document has not
+               // yet been saved to disk.
+               if (checkBuffer->isClean() || acceptDirty || !filename.exists())
                        return checkBuffer;
-               docstring const file = makeDisplayPath(filename.absFilename(), 20);
+               docstring const file = makeDisplayPath(filename.absFileName(), 20);
                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);
@@ -83,11 +85,11 @@ Buffer * checkAndLoadLyXFile(FileName const & filename, bool const acceptDirty)
                if (!filename.isReadableFile()) {
                        docstring text = bformat(_("The file %1$s exists but is not "
                                "readable by the current user."),
-                               from_utf8(filename.absFilename()));
+                               from_utf8(filename.absFileName()));
                        Alert::error(_("File not readable!"), text);
                        return 0;
                }
-               Buffer * b = theBufferList().newBuffer(filename.absFilename());
+               Buffer * b = theBufferList().newBuffer(filename.absFileName());
                if (!b) {
                        // Buffer creation is not possible.
                        return 0;
@@ -103,10 +105,10 @@ Buffer * checkAndLoadLyXFile(FileName const & filename, bool const acceptDirty)
 
        docstring text = bformat(_("The document %1$s does not yet "
                "exist.\n\nDo you want to create a new document?"),
-               from_utf8(filename.absFilename()));
+               from_utf8(filename.absFileName()));
        if (!Alert::prompt(_("Create new document?"),
                        text, 0, 1, _("&Create"), _("Cancel")))
-               return newFile(filename.absFilename(), string(), true);
+               return newFile(filename.absFileName(), string(), true);
 
        return 0;
 }
@@ -131,7 +133,7 @@ Buffer * newFile(string const & filename, string const & templatename,
 
        if (!tname.empty()) {
                if (!b->readFile(tname)) {
-                       docstring const file = makeDisplayPath(tname.absFilename(), 50);
+                       docstring const file = makeDisplayPath(tname.absFileName(), 50);
                        docstring const text  = bformat(
                                _("The specified document template\n%1$s\ncould not be read."),
                                file);
@@ -144,7 +146,10 @@ 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.
+               b->markDirty();
 
        b->setReadonly(false);
        b->setFullyLoaded(true);
@@ -166,7 +171,7 @@ Buffer * newUnnamedFile(FileName const & path, string const & prefix,
        }
        while (theBufferList().exists(filename) || filename.isReadableFile());
                
-       return newFile(filename.absFilename(), templatename, false);
+       return newFile(filename.absFileName(), templatename, false);
 }
 
 
@@ -258,7 +263,7 @@ Buffer * loadIfNeeded(FileName const & fname)
                if (!fname.exists())
                        return 0;
 
-               buffer = theBufferList().newBuffer(fname.absFilename());
+               buffer = theBufferList().newBuffer(fname.absFileName());
                if (!buffer)
                        // Buffer creation is not possible.
                        return 0;