cleanup after svn hang-up, #undef CursorShape. Should be compilable ganin now.

[lyx.git] / src / LyXAction.C

diff --git a/src/LyXAction.C b/src/LyXAction.C
index ddef58b000315ac1a3a1ad792891cec235c99386..b035494ff3816b06a9ff33055958d033ff3876de 100644 (file)
--- a/src/LyXAction.C
+++ b/src/LyXAction.C
@@ -264,7 +264,6 @@ void LyXAction::init()
                { LFUN_SCREEN_RECENTER, "screen-recenter", ReadOnly },
                { LFUN_SCREEN_UP, "screen-up", ReadOnly | NoUpdate},
                { LFUN_SCREEN_UP_SELECT, "screen-up-select", ReadOnly },
-               { LFUN_INSET_SCROLL, "inset-scroll", ReadOnly },
                { LFUN_SELF_INSERT, "self-insert", SingleParUpdate },
                { LFUN_SPACE_INSERT, "space-insert", Noop },
                { LFUN_SERVER_CHAR_AFTER, "server-char-after", ReadOnly },
@@ -323,16 +322,15 @@ void LyXAction::init()
                { LFUN_ALL_CHANGES_REJECT, "all-changes-reject", Noop },
                { LFUN_DIALOG_SHOW, "dialog-show", NoBuffer },
                { LFUN_DIALOG_SHOW_NEW_INSET, "dialog-show-new-inset", Noop },
-               { LFUN_DIALOG_SHOW_NEXT_INSET, "dialog-show-next-inset", Noop },
                { LFUN_DIALOG_UPDATE, "dialog-update", NoBuffer },
                { LFUN_DIALOG_HIDE, "dialog-hide", Noop },
                { LFUN_DIALOG_DISCONNECT_INSET, "dialog-disconnect-inset", Noop },
                { LFUN_INSET_APPLY, "inset-apply", Noop },
+               { LFUN_INSET_DISSOLVE, "inset-dissolve", Noop },
                { LFUN_INSET_INSERT, "inset-insert", Noop },
                { LFUN_INSET_MODIFY, "", Noop },
                { LFUN_INSET_DIALOG_UPDATE, "", Noop },
                { LFUN_INSET_SETTINGS, "inset-settings", ReadOnly },
-               { LFUN_INSET_DIALOG_SHOW, "inset-dialog-show", Noop },
                { LFUN_PARAGRAPH_PARAMS_APPLY, "paragraph-params-apply", Noop },
                { LFUN_PARAGRAPH_UPDATE, "", Noop },
                { LFUN_EXTERNAL_EDIT, "external-edit", Noop },