Let getPosNearX take horizontal scrolling into account

[lyx.git] / src / Buffer.cpp

diff --git a/src/Buffer.cpp b/src/Buffer.cpp
index 54a1ee4ac9631212e5d696d2b270cbbfcc3bfcfe..e2185fbd897a18711e63f3a4c0335fa66ad007d9 100644 (file)
--- a/src/Buffer.cpp
+++ b/src/Buffer.cpp
@@ -1321,7 +1321,7 @@ FileName Buffer::getBackupName() const {
                fn.onlyPath().absFileName() :
                lyxrc.backupdir_path;
        string const fform = convert<string>(d->file_format);
-       string const backname = fname + "-" + fform;
+       string const backname = fname + "-lyxformat-" + fform;
        FileName backup(addName(fpath, addExtension(backname, fext)));
 
        // limit recursion, just in case
@@ -2229,8 +2229,8 @@ void Buffer::getLabelList(vector<docstring> & list) const
 
        list.clear();
        shared_ptr<Toc> toc = d->toc_backend.toc("label");
-       TocIterator toc_it = toc->begin();
-       TocIterator end = toc->end();
+       Toc::const_iterator toc_it = toc->begin();
+       Toc::const_iterator end = toc->end();
        for (; toc_it != end; ++toc_it) {
                if (toc_it->depth() == 0)
                        list.push_back(toc_it->str());
@@ -2765,12 +2765,14 @@ void Buffer::dispatch(FuncRequest const & func, DispatchResult & dr)
                break;
 
        case LFUN_CHANGES_TRACK:
-               undo().recordUndoBufferParams(CursorData());
+               if (params().save_transient_properties)
+                       undo().recordUndoBufferParams(CursorData());
                params().track_changes = !params().track_changes;
                break;
 
        case LFUN_CHANGES_OUTPUT:
-               undo().recordUndoBufferParams(CursorData());
+               if (params().save_transient_properties)
+                       undo().recordUndoBufferParams(CursorData());
                params().output_changes = !params().output_changes;
                if (params().output_changes) {
                        bool dvipost    = LaTeXFeatures::isAvailable("dvipost");