anne/lyx_mirror
1
0
Fork 0
mirror of https://git.lyx.org/repos/lyx.git synced 2025-01-03 08:28:25 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Bump RC format for commit 260a98d2

Browse Source
This commit is contained in:
Enrico Forestieri 2015-05-23 18:24:26 +02:00
parent 260a98d295
commit c2a18fc142
3 changed files with 8 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
lib/configure.py
View File

@ -1491,7 +1491,7 @@ if __name__ == '__main__':
lyx_check_config = True lyx_check_config = True
lyx_kpsewhich = True lyx_kpsewhich = True
outfile = 'lyxrc.defaults' outfile = 'lyxrc.defaults'
lyxrc_fileformat = 17 lyxrc_fileformat = 18
rc_entries = '' rc_entries = ''
lyx_keep_temps = False lyx_keep_temps = False
version_suffix = '' version_suffix = ''

7
lib/scripts/prefs2prefs_prefs.py
View File

@ -73,6 +73,10 @@
# Incremented to format 17, by lasgouttes # Incremented to format 17, by lasgouttes
# Remove rtl_support rc. # 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 # NOTE: The format should also be updated in LYXRC.cpp and
# in configure.py. # in configure.py.
@ -355,5 +359,6 @@ conversions = [
[ 14, []], [ 14, []],
[ 15, []], [ 15, []],
[ 16, [remove_force_paint_single_char]], [ 16, [remove_force_paint_single_char]],
[ 17, [remove_rtl]] [ 17, [remove_rtl]],
[ 18, []]
] ]

2
src/LyXRC.cpp
View File

@ -58,7 +58,7 @@ namespace {
// The format should also be updated in configure.py, and conversion code // The format should also be updated in configure.py, and conversion code
// should be added to prefs2prefs_prefs.py. // 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! // when adding something to this array keep it sorted!
LexerKeyword lyxrcTags[] = { LexerKeyword lyxrcTags[] = {