Fix natbib bug spotted by JMarc.

[lyx.git] / src / LyXAction.C

diff --git a/src/LyXAction.C b/src/LyXAction.C
index 6d5a7a011067b4ad4a624285bd940e37b7d68bd0..15fdc2d2ea203a0e3f5e4e70d989384b16e95b3b 100644 (file)
--- a/src/LyXAction.C
+++ b/src/LyXAction.C
@@ -99,7 +99,6 @@ void LyXAction::init()
                { LFUN_UMLAUT, "accent-umlaut", "", Noop },
                { LFUN_UNDERBAR, "accent-underbar", "", Noop },
                { LFUN_UNDERDOT, "accent-underdot", "", Noop },
-               { LFUN_VECTOR, "accent-vector", "", Noop },
                { LFUN_APPENDIX, "appendix", N_("Insert appendix"), Noop },
                { LFUN_APROPOS, "apropos", N_("Describe command"),
                  NoBuffer|ReadOnly },
@@ -107,7 +106,7 @@ void LyXAction::init()
                  N_("Select previous char"), ReadOnly },
                { LFUN_BIBDB_ADD, "bibtex-database-add", "", Noop },
                { LFUN_BIBDB_DEL, "bibtex-database-del", "", Noop },
-               { LFUN_INSERT_BIBTEX, "bibtex-insert", N_("Insert bibtex"),
+               { LFUN_INSERT_BIBTEX, "bibtex-insert", N_("Insert BibTeX"),
                  Noop },
                { LFUN_BIBTEX_STYLE, "bibtex-style", "", Noop },
                { LFUN_BOOKMARK_GOTO, "bookmark-goto", "", ReadOnly },
@@ -414,6 +413,12 @@ void LyXAction::init()
                { LFUN_FORKS_KILL, "kill-forks",
                  N_("Kill the forked process with this PID"), NoBuffer },
                { LFUN_TOOLTIPS_TOGGLE, "toggle-tooltips", "", NoBuffer },
+               { LFUN_TRACK_CHANGES, "track-changes", N_("Begin tracking changes"), Noop },
+               { LFUN_MERGE_CHANGES, "merge-changes", N_("Merge changes"), Noop },
+               { LFUN_ACCEPT_CHANGE, "accept-change", N_("Accept selected change"), Noop },
+               { LFUN_REJECT_CHANGE, "reject-change", N_("Reject selected change"), Noop },
+               { LFUN_ACCEPT_ALL_CHANGES, "accept-all-changes", N_("Accept all changes"), Noop },
+               { LFUN_REJECT_ALL_CHANGES, "reject-all-changes", N_("Reject all changes"), Noop }, 
                { LFUN_NOACTION, "", "", Noop }
        };
 
@@ -534,7 +539,7 @@ string const LyXAction::getActionName(int action) const
 {
        FuncRequest ev = retrieveActionArg(action);
        if (!ev.argument.empty())
-               ev.argument.insert(0u, 1, ' ');
+               ev.argument.insert(string::size_type(0), 1, ' ');
 
        info_map::const_iterator const it = lyx_info_map.find(ev.action);