Parse the picture variant of \framebox correctly (part of bug #6449)

[lyx.git] / src / LyXVC.cpp

diff --git a/src/LyXVC.cpp b/src/LyXVC.cpp
index 65e83a33f60450104cf2c96ca2bb1e894c6ffdda..01743ecadbfff37e52fb86c64781c51caa3e16dc 100644 (file)
--- a/src/LyXVC.cpp
+++ b/src/LyXVC.cpp
@@ -171,6 +171,8 @@ string LyXVC::checkIn()
        if (ok) {
                if (response.empty())
                        response = empty;
+               //shell collisions
+               response = subst(response, from_utf8("\""), from_utf8("\\\""));
                log = vcs->checkIn(to_utf8(response));
 
                // Reserve empty string for cancel button
@@ -208,7 +210,7 @@ string LyXVC::lockingToggle()
 }
 
 
-void LyXVC::revert()
+bool LyXVC::revert()
 {
        LYXERR(Debug::LYXVC, "LyXVC: revert");
 
@@ -221,8 +223,7 @@ void LyXVC::revert()
                ret = Alert::prompt(_("Revert to stored version of document?"),
                        text, 0, 1, _("&Revert"), _("&Cancel"));
 
-       if (ret == 0)
-               vcs->revert();
+       return ret == 0 && vcs->revert();
 }