comment

[lyx.git] / src / LyXFunc.cpp

diff --git a/src/LyXFunc.cpp b/src/LyXFunc.cpp
index 3a164fbf280b068880a9f973b3f08daed4ac3c68..2a8bcb3dbc119fe593c647d25585946dad6cb354 100644 (file)
--- a/src/LyXFunc.cpp
+++ b/src/LyXFunc.cpp
@@ -461,15 +461,17 @@ FuncStatus LyXFunc::getStatus(FuncRequest const & cmd) const
                enable = !buf->lyxvc().inUse();
                break;
        case LFUN_VC_CHECK_IN:
-               enable = buf->lyxvc().inUse() && !buf->isReadonly();
+               enable = buf->lyxvc().checkInEnabled();
                break;
        case LFUN_VC_CHECK_OUT:
-               enable = buf->lyxvc().inUse() && buf->isReadonly();
+               enable = buf->lyxvc().checkOutEnabled();
                break;
        case LFUN_VC_REVERT:
-       case LFUN_VC_UNDO_LAST:
                enable = buf->lyxvc().inUse();
                break;
+       case LFUN_VC_UNDO_LAST:
+               enable = buf->lyxvc().undoLastEnabled();
+               break;
        case LFUN_BUFFER_RELOAD:
                enable = !buf->isUnnamed() && buf->fileName().exists()
                        && (!buf->isClean() || buf->isExternallyModified(Buffer::timestamp_method));
@@ -1177,7 +1179,7 @@ void LyXFunc::dispatch(FuncRequest const & cmd)
                                break;
                        } 
                        case ERT_CODE: {
-                               data = InsetERT::params2string(InsetCollapsable::Open, docstring());
+                               data = InsetERT::params2string(InsetCollapsable::Open);
                                break;
                        } 
                        case EXTERNAL_CODE: {
@@ -1838,6 +1840,7 @@ void actOnUpdatedPrefs(LyXRC const & lyxrc_orig, LyXRC const & lyxrc_new)
        case LyXRC::RC_LANGUAGE_GLOBAL_OPTIONS:
        case LyXRC::RC_LANGUAGE_PACKAGE:
        case LyXRC::RC_LANGUAGE_USE_BABEL:
+       case LyXRC::RC_MAC_LIKE_WORD_MOVEMENT:
        case LyXRC::RC_MACRO_EDIT_STYLE:
        case LyXRC::RC_MAKE_BACKUP:
        case LyXRC::RC_MARK_FOREIGN_LANGUAGE: