Merge branch 'master' of git.lyx.org:lyx

[lyx.git] / lib / scripts / prefs2prefs_prefs.py

diff --git a/lib/scripts/prefs2prefs_prefs.py b/lib/scripts/prefs2prefs_prefs.py
index 5d4a769b4667906c427afcbca76c182bcee2ced2..977d2612bc254a64ad59d0db0896cdd08f139c28 100644 (file)
--- a/lib/scripts/prefs2prefs_prefs.py
+++ b/lib/scripts/prefs2prefs_prefs.py
@@ -43,6 +43,13 @@
 #   Add "nice" flag for converters
 #   No conversion necessary.
 
+# Incremented to format 9, a18af620 by spitz
+#  Remove default_language rc.
+
+# Incremented to format 10, 4985015 by tommaso
+#  Add close_buffer_with_last_view in preferences.
+#  No conversion necessary.
+
 import re
 
 ###########################################################
@@ -229,6 +236,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 +260,7 @@ conversions = [
        [ 5, []],
        [ 6, []],
        [ 7, [add_mime_types]],
-       [ 8, []]
+       [ 8, []],
+       [ 9, [ remove_default_language ]],
+       [ 10, []]
 ]