reorder.

[lyx.git] / src / Buffer.cpp

diff --git a/src/Buffer.cpp b/src/Buffer.cpp
index 9970af3181b78566a5c00b3746b55dab74d624f0..d9d9547df5d00f26556036b5e141fd24718756d5 100644 (file)
--- a/src/Buffer.cpp
+++ b/src/Buffer.cpp
@@ -125,7 +125,7 @@ namespace {
 
 // Do not remove the comment below, so we get merge conflict in
 // independent branches. Instead add your own.
-int const LYX_FORMAT = 354;  // jspitzm: support for \print[sub]index*
+int const LYX_FORMAT = 360;  // jspitzm: nomencl custom width
 
 typedef map<string, bool> DepClean;
 typedef map<docstring, pair<InsetLabel const *, Buffer::References> > RefCache;
@@ -525,6 +525,7 @@ int Buffer::readHeader(Lexer & lex)
        params().clearRemovedModules();
        params().pdfoptions().clear();
        params().indiceslist().clear();
+       params().backgroundcolor = lyx::rgbFromHexName("#ffffff");
 
        for (int i = 0; i < 4; ++i) {
                params().user_defined_bullet(i) = ITEMIZE_DEFAULTS[i];
@@ -2607,7 +2608,16 @@ int AutoSaveBuffer::generateChild()
 
 FileName Buffer::getAutosaveFilename() const
 {
-       string const fpath = isUnnamed() ? lyxrc.document_path : filePath();
+       // if the document is unnamed try to save in the backup dir, else
+       // in the default document path, and as a last try in the filePath, 
+       // which will most often be the temporary directory
+       string fpath;
+       if (isUnnamed())
+               fpath = lyxrc.backupdir_path.empty() ? lyxrc.document_path
+                       : lyxrc.backupdir_path;
+       if (!isUnnamed() || fpath.empty() || !FileName(fpath).exists())
+               fpath = filePath();
+
        string const fname = "#" + d->filename.onlyFileName() + "#";
        return makeAbsPath(fname, fpath);
 }