anne/lyx_mirror
1
0
Fork 0
mirror of https://git.lyx.org/repos/lyx.git synced 2024-11-22 10:00:33 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Revert "Do not kill the undo stack when doing a Save As..."

Browse Source 
This commit was causing bug #8821.

This reverts commit 467422f9df.
This commit is contained in:
Jean-Marc Lasgouttes 2013-10-04 15:01:42 +02:00
parent f835134f16
commit b89ef8a5b3
3 changed files with 4 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/Buffer.cpp
View File

@ -4736,7 +4736,7 @@ int Buffer::charCount(bool with_blanks) const
}
Buffer::ReadStatus Buffer::reload(bool clearUndo)
Buffer::ReadStatus Buffer::reload()
{
setBusy(true);
// c.f. bug http://www.lyx.org/trac/ticket/6587
@ -4754,8 +4754,7 @@ Buffer::ReadStatus Buffer::reload(bool clearUndo)
updateTitles();
markClean();
message(bformat(_("Document %1$s reloaded."), disp_fn));
if (clearUndo)
d->undo_.clear();
d->undo_.clear();
} else {
message(bformat(_("Could not reload document %1$s."), disp_fn));
}

3
src/Buffer.h
View File

@ -230,8 +230,7 @@ public:
/// read a new document from a string
bool readString(std::string const &);
/// Reloads the LyX file
/// \param clearUndo if false, leave alone the undo stack.
ReadStatus reload(bool clearUndo = true);
ReadStatus reload();
//FIXME: The following function should be private
//private:
/// read the header, returns number of unknown tokens

2
src/frontends/qt4/GuiView.cpp
View File

@ -2364,7 +2364,7 @@ bool GuiView::renameBuffer(Buffer & b, docstring const & newname, RenameKind kin
bool const saved = saveBuffer(b, fname);
if (saved)
b.reload(false);
b.reload();
return saved;
}