Account for old versions of Pygments

[lyx.git] / src / LyXVC.cpp

diff --git a/src/LyXVC.cpp b/src/LyXVC.cpp
index 15d2626ce7567846aae5c95d218a1ac30833d6af..97a0554e8c4212a73acb648f773541dc0311219d 100644 (file)
--- a/src/LyXVC.cpp
+++ b/src/LyXVC.cpp
@@ -41,9 +41,14 @@ LyXVC::LyXVC()
 }
 
 
-string LyXVC::vcname() const
+docstring LyXVC::vcstatus() const
 {
-       return vcs->vcname();
+       if (!vcs)
+               return docstring();
+       if (locking())
+               return bformat(_("%1$s lock"), from_ascii(vcs->vcname()));
+       else
+               return from_ascii(vcs->vcname());
 }
 
 
@@ -257,7 +262,7 @@ string LyXVC::checkOut()
        if (!vcs)
                return string();
        //RCS allows checkOut only in ReadOnly mode
-       if (vcs->toggleReadOnlyEnabled() && !owner_->isReadonly())
+       if (vcs->toggleReadOnlyEnabled() && !owner_->hasReadonlyFlag())
                return string();
 
        LYXERR(Debug::LYXVC, "LyXVC: checkOut");
@@ -330,7 +335,7 @@ string LyXVC::toggleReadOnly()
        }
        case VCS::NOLOCKING:
                Buffer * b = vcs->owner();
-               bool const newstate = !b->isReadonly();
+               bool const newstate = !b->hasReadonlyFlag();
                string result = "LyXVC: toggle to ";
                result += (newstate ? "readonly" : "readwrite");
                LYXERR(Debug::LYXVC, result);