Allow an unnamed buffer to be saved with the same name

The check whether fname != oldname does not work for unnamed buffers.
Therefore, we check explicitly whether the Buffer that already exists with
the same name isn't really the buffer we are trying to save.
(cherry picked from commit 30475664d3)
This commit is contained in:
Vincent van Ravesteijn 2012-05-14 15:26:51 +02:00
parent d475caf278
commit 7dfca01f48

View File

@ -2259,8 +2259,10 @@ bool GuiView::renameBuffer(Buffer & b, docstring const & newname)
// fname is now the new Buffer location. // fname is now the new Buffer location.
// if there is already a Buffer open with this name, we do not want // if there is already a Buffer open with this name, we do not want
// to have another one. // to have another one. (the second test makes sure we're not just
if (theBufferList().exists(fname) && fname != oldname) { // trying to overwrite ourselves, which is fine.)
if (theBufferList().exists(fname) && fname != oldname
&& theBufferList().getBuffer(fname) != &b) {
docstring const text = docstring const text =
bformat(_("The file\n%1$s\nis already open in your current session.\n" bformat(_("The file\n%1$s\nis already open in your current session.\n"
"Please close it before attempting to overwrite it.\n" "Please close it before attempting to overwrite it.\n"