don't rm emergency saves ever

[lyx.git] / src / lyxvc.C

diff --git a/src/lyxvc.C b/src/lyxvc.C
index 5dff933476ccba05a8e623ef84f80be54f5ea890..e798317e6134975bf19c3af3360f9f1e80d837eb 100644 (file)
--- a/src/lyxvc.C
+++ b/src/lyxvc.C
@@ -13,7 +13,7 @@
 
 #include "support/filetools.h"
 #include "support/lyxlib.h"
-#include "BoostFormat.h"
+#include "support/BoostFormat.h"
 
 #include <unistd.h>
 
@@ -89,7 +89,7 @@ bool LyXVC::ensureClean()
        text += file + _(" has unsaved changes.\n\nDo you want to save the document?");
 #endif
        int const ret = Alert::prompt(_("Save changed document?"),
-               text, 0, _("&Save"), _("&Cancel"));
+               text, 0, 1, _("&Save"), _("&Cancel"));
 
        if (ret == 0) {
                vcs->owner()->getUser()->owner()->dispatch(FuncRequest(LFUN_MENUWRITE));
@@ -105,9 +105,9 @@ void LyXVC::registrer()
 
        // there must be a file to save
        if (!IsFileReadable(filename)) {
-               Alert::alert(_("File not saved"),
-                       _("You must save the file"),
-                       _("before it can be registered."));
+               Alert::error(_("Document not saved"),
+                       _("You must save the document "
+                         "before it can be registered."));
                return;
        }
 
@@ -145,8 +145,6 @@ void LyXVC::registrer()
        if (!tmp.first || tmp.second.empty()) {
                // should we insist on checking tmp.second.empty()?
                lyxerr[Debug::LYXVC] << "LyXVC: user cancelled" << endl;
-               Alert::alert(_("Info"),
-                          _("This document has NOT been registered."));
                return;
        }
 
@@ -205,7 +203,7 @@ void LyXVC::revert()
        text += file + _(" will lose all current changes.\n\nDo you want to revert to the saved version?");
 #endif
        int const ret = Alert::prompt(_("Revert to stored version of document?"),
-               text, 1, _("&Revert"), _("&Cancel"));
+               text, 0, 1, _("&Revert"), _("&Cancel"));
 
        if (ret == 0)
                vcs->revert();