diff --git a/lib/RELEASE-NOTES b/lib/RELEASE-NOTES index 5dceaa1486..2a1157eea5 100644 --- a/lib/RELEASE-NOTES +++ b/lib/RELEASE-NOTES @@ -32,12 +32,14 @@ !!!The following new LyX functions have been introduced in 2.4: -LFUN_EXPORT_CANCEL: Used to cancel background export processes. +* export-cancel: Used to cancel background export processes. !!!The following LyX functions have been changed in 2.4: -- LFUN_SET_GRAPHICS_GROUP was renamed into LFUN_GRAPHICS_SET_GROUP. +* set-graphics-group was renamed to graphics-set-group. + +* info-insert buffer vcs-*: renamed to info-insert vcs * diff --git a/lib/scripts/prefs2prefs_lfuns.py b/lib/scripts/prefs2prefs_lfuns.py index ff55a61e8d..2ffb7f1d74 100644 --- a/lib/scripts/prefs2prefs_lfuns.py +++ b/lib/scripts/prefs2prefs_lfuns.py @@ -196,6 +196,27 @@ def label_copy_as_reference(line): def remove_print_support(line): return simple_remove(line, "dialog-show print") + +def info_rename_vcsauthor(line): + return simple_renaming(line, "info-insert buffer vcs-author", "info-insert vcs author") + + +def info_rename_vcsdate(line): + return simple_renaming(line, "info-insert buffer vcs-date", "info-insert vcs date") + + +def info_rename_vcstime(line): + return simple_renaming(line, "info-insert buffer vcs-time", "info-insert vcs time") + + +def info_rename_vcsrevision(line): + return simple_renaming(line, "info-insert buffer vcs-revision", "info-insert vcs revision") + + +def info_rename_vcstreerevision(line): + return simple_renaming(line, "info-insert buffer vcs-tree-revision", "info-insert vcs tree-revision") + + # ########################################################### @@ -226,5 +247,12 @@ conversions = [ ]], [ 4, [ # list of conversions to format 4, LyX 2.2 redo_tabular_feature + ]], + [ 5, [ # list of conversions to format 5, LyX 2.4 + info_rename_vcsauthor, + info_rename_vcsdate, + info_rename_vcstime, + info_rename_vcsrevision, + info_rename_vcstreerevision ]] ] diff --git a/src/LyXAction.h b/src/LyXAction.h index f61772c56c..30aeac03d7 100644 --- a/src/LyXAction.h +++ b/src/LyXAction.h @@ -22,7 +22,7 @@ namespace lyx { // current LFUN format -static unsigned int const LFUN_FORMAT = 4; // gm: tabular-feature +static unsigned int const LFUN_FORMAT = 5; // spitz: 2.4.x changes class FuncRequest; class LyXErr;