Complete default_language rc removal

diff --git a/lib/scripts/prefs2prefs_prefs.py b/lib/scripts/prefs2prefs_prefs.py
index 5d4a769b4667906c427afcbca76c182bcee2ced2..8e16899de64f1e6e2188ddf53db02193bccd3904 100644 (file)
--- a/lib/scripts/prefs2prefs_prefs.py
+++ b/lib/scripts/prefs2prefs_prefs.py
@@ -43,6 +43,9 @@
 #   Add "nice" flag for converters
 #   No conversion necessary.
 
+# Incremented to format 9, by spitz
+#  Remove default_language rc.
+
 import re
 
 ###########################################################
@@ -229,6 +232,12 @@ def add_mime_types(line):
                converted = converted + '       ""'
        return (True, converted)
 
+def remove_default_language(line):
+       if not line.lower().startswith("\\default_language"):
+               return no_match
+       return (True, "")
+
+
 # End conversions for LyX 2.0 to 2.1
 ####################################
 
@@ -247,5 +256,6 @@ conversions = [
        [ 5, []],
        [ 6, []],
        [ 7, [add_mime_types]],
-       [ 8, []]
+       [ 8, []],
+       [ 9, [ remove_default_language ]]
 ]

diff --git a/src/LyXRC.cpp b/src/LyXRC.cpp
index d980c22ae58481905b05701c723811096a3a0f7d..4669f68babbfd9016ce578f8dbb6d4c85fab351f 100644 (file)
--- a/src/LyXRC.cpp
+++ b/src/LyXRC.cpp
@@ -55,7 +55,7 @@ namespace os = support::os;
 
 namespace {
 
-static unsigned int const LYXRC_FILEFORMAT = 8; // rgh: add "nice" flag
+static unsigned int const LYXRC_FILEFORMAT = 9; // spitz: remove \\default_language
 
 // when adding something to this array keep it sorted!
 LexerKeyword lyxrcTags[] = {