From c2a18fc14238a5204a7a941ce0df21dcc77e4ae9 Mon Sep 17 00:00:00 2001 From: Enrico Forestieri Date: Sat, 23 May 2015 18:24:26 +0200 Subject: [PATCH] Bump RC format for commit 260a98d2 --- lib/configure.py | 2 +- lib/scripts/prefs2prefs_prefs.py | 7 ++++++- src/LyXRC.cpp | 2 +- 3 files changed, 8 insertions(+), 3 deletions(-) diff --git a/lib/configure.py b/lib/configure.py index 0b06cdecc2..5cd4f1ac04 100644 --- a/lib/configure.py +++ b/lib/configure.py @@ -1491,7 +1491,7 @@ if __name__ == '__main__': lyx_check_config = True lyx_kpsewhich = True outfile = 'lyxrc.defaults' - lyxrc_fileformat = 17 + lyxrc_fileformat = 18 rc_entries = '' lyx_keep_temps = False version_suffix = '' diff --git a/lib/scripts/prefs2prefs_prefs.py b/lib/scripts/prefs2prefs_prefs.py index 9776cfeb45..61f8ce5028 100644 --- a/lib/scripts/prefs2prefs_prefs.py +++ b/lib/scripts/prefs2prefs_prefs.py @@ -73,6 +73,10 @@ # Incremented to format 17, by lasgouttes # Remove rtl_support rc. +# Incremented to format 18, by ef +# Add option to allow saving the document directory +# No conversion necessary. + # NOTE: The format should also be updated in LYXRC.cpp and # in configure.py. @@ -355,5 +359,6 @@ conversions = [ [ 14, []], [ 15, []], [ 16, [remove_force_paint_single_char]], - [ 17, [remove_rtl]] + [ 17, [remove_rtl]], + [ 18, []] ] diff --git a/src/LyXRC.cpp b/src/LyXRC.cpp index 650b1dfdf4..990b4b93d0 100644 --- a/src/LyXRC.cpp +++ b/src/LyXRC.cpp @@ -58,7 +58,7 @@ namespace { // The format should also be updated in configure.py, and conversion code // should be added to prefs2prefs_prefs.py. -static unsigned int const LYXRC_FILEFORMAT = 17; // lasgouttes: remove \\rtl +static unsigned int const LYXRC_FILEFORMAT = 18; // ef: save_origin // when adding something to this array keep it sorted! LexerKeyword lyxrcTags[] = {