Scott Kostyshak wrote:
> > > I propose that we drop the '*' modification flag and let only the warning
> > > about external modification. That way one can easily see whether there is
> > > merge problem because file got edited meanwhile or just reload is enough.
> > >
> > > Opinions?
> > >
> > > Pavel
> >
> > +1
>
> That makes sense. I think I encountered this exact same confusion
> before, but did not realize that the * is always added.
Patch is attached. Will commit unless there is some objection. Pavel
diff --git a/src/Buffer.cpp b/src/Buffer.cpp
index 7cabe6fce1..1c186deeaf 100644
--- a/src/Buffer.cpp
+++ b/src/Buffer.cpp
@@ -5293,7 +5293,6 @@ void Buffer::Impl::fileExternallyModified(bool const
exists)
"checksum unchanged: " << filename);
return;
}
- lyx_clean = bak_clean = false;
// If the file has been deleted, only mark the file as dirty since it is
// pointless to prompt for reloading. If later a file is moved into this
// location, then the externally modified warning will appear then.
