VCS: Handle one boundary condition.

[lyx.git] / src / LyXFunc.cpp

diff --git a/src/LyXFunc.cpp b/src/LyXFunc.cpp
index a869903c284ad08f1c2b49904ad5df3b270ef09e..fcb7020f407209a88a9d498e91eda17fcd552f3f 100644 (file)
--- a/src/LyXFunc.cpp
+++ b/src/LyXFunc.cpp
@@ -458,7 +458,7 @@ FuncStatus LyXFunc::getStatus(FuncRequest const & cmd) const
                break;
 
        case LFUN_VC_REGISTER:
-               enable = !buf->lyxvc().inUse();
+               enable = !buf->lyxvc().inUse() && !buf->isUnnamed();
                break;
        case LFUN_VC_CHECK_IN:
                enable = buf->lyxvc().checkInEnabled();
@@ -1037,7 +1037,7 @@ void LyXFunc::dispatch(FuncRequest const & cmd)
                // --- version control -------------------------------
                case LFUN_VC_REGISTER:
                        LASSERT(lyx_view_ && lyx_view_->buffer(), /**/);
-                       if (!ensureBufferClean(view()))
+                       if (!ensureBufferClean(view()) || lyx_view_->buffer()->isUnnamed())
                                break;
                        if (!lyx_view_->buffer()->lyxvc().inUse()) {
                                lyx_view_->buffer()->lyxvc().registrer();
@@ -1052,7 +1052,7 @@ void LyXFunc::dispatch(FuncRequest const & cmd)
                                break;
                        if (lyx_view_->buffer()->lyxvc().inUse()
                                        && !lyx_view_->buffer()->isReadonly()) {
-                               lyx_view_->buffer()->lyxvc().checkIn();
+                               setMessage(from_utf8(lyx_view_->buffer()->lyxvc().checkIn()));
                                reloadBuffer();
                        }
                        break;
@@ -1062,7 +1062,7 @@ void LyXFunc::dispatch(FuncRequest const & cmd)
                        if (!ensureBufferClean(view()))
                                break;
                        if (lyx_view_->buffer()->lyxvc().inUse()) {
-                               lyx_view_->buffer()->lyxvc().checkOut();
+                               setMessage(from_utf8(lyx_view_->buffer()->lyxvc().checkOut()));
                                reloadBuffer();
                        }
                        break;