anne/lyx_mirror
1
0
Fork 0
mirror of https://git.lyx.org/repos/lyx.git synced 2024-11-25 19:07:45 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Bump up RC fileformat after [244de5d2/lyxgit] for the new 'needauth' options.

Browse Source 
Addressing #10481.
This commit is contained in:
Tommaso Cucinotta 2016-11-25 23:33:08 +01:00
parent ffe4471700
commit cc653feb60
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

@ -1551,7 +1551,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 = 19 lyxrc_fileformat = 20
rc_entries = '' rc_entries = ''
lyx_keep_temps = False lyx_keep_temps = False
version_suffix = '' version_suffix = ''

7
lib/scripts/prefs2prefs_prefs.py
View File

@ -80,6 +80,10 @@
# Incremented to format 19, by rgh # Incremented to format 19, by rgh
# remove print support # remove print support
# Incremented to format 20, by tommaso
# Add options to forbid/ignore 'needauth' option
# 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.
@ -375,5 +379,6 @@ conversions = [
[ 16, [remove_force_paint_single_char]], [ 16, [remove_force_paint_single_char]],
[ 17, [remove_rtl]], [ 17, [remove_rtl]],
[ 18, []], [ 18, []],
[ 19, [remove_print_support]] [ 19, [remove_print_support]],
[ 20, []]
] ]

2
src/LyXRC.cpp
View File

@ -59,7 +59,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 = 19; // rgh: remove print support static unsigned int const LYXRC_FILEFORMAT = 20; // tommaso: 'needauth' options
// when adding something to this array keep it sorted! // when adding something to this array keep it sorted!
LexerKeyword lyxrcTags[] = { LexerKeyword lyxrcTags[] = {