What I have found useful is to turn off auto-save and enable the timeout on "save changes on closing". This allows to easily save changes or revert on closing.