Revert "Revert "Fix commented out code""

[features.git] / src / Buffer.cpp

diff --git a/src/Buffer.cpp b/src/Buffer.cpp
index e848b0f69be238521ffced888e603e07097ba3c9..c3d1276b8468d92f03f9d1dfe4c09d6035811f3d 100644 (file)
--- a/src/Buffer.cpp
+++ b/src/Buffer.cpp
@@ -4770,17 +4770,18 @@ Buffer::ReadStatus Buffer::loadEmergency()
        }
 
        case 2: {
-               string f1 = d->filename.absFileName();
-               string f2 = emergencyFile.absFileName();
+               string const f1 = d->filename.absFileName();
+               string const f2 = emergencyFile.absFileName();
                if (loadThisLyXFile(d->filename) != ReadSuccess)
                        return ReadCancel;
-               string par = "compare run-blocking " + quoteName(f1) + " " + quoteName(f2);
+               string const par = "compare run-blocking " + quoteName(f1) + " " + quoteName(f2);
                LYXERR(Debug::FILES, par << "\n");
                lyx::dispatch(FuncRequest(LFUN_DIALOG_SHOW, par));
 
                //release the emergency buffer loaded by compare
                Buffer * emerBuffer = theBufferList().getBuffer(emergencyFile);
-               if (emerBuffer) theBufferList().release(emerBuffer);
+               if (emerBuffer)
+                       theBufferList().release(emerBuffer);
 
                return ReadCancel; //Release the buffer of Original immediatelly
        }
@@ -4913,6 +4914,13 @@ void Buffer::bufferRefs(TeXErrors const & terr, ErrorList & errorList) const
 }
 
 
+void Buffer::updateBuffer() const
+{
+       updateBuffer(UpdateMaster, InternalUpdate);
+       d->need_update = false;
+}
+
+
 void Buffer::updateBuffer(UpdateScope scope, UpdateType utype) const
 {
        LBUFERR(!text().paragraphs().empty());