The branch, master, has been updated.
- Log -----------------------------------------------------------------
commit a18af62087f92223be1a677f2e153c9f2865192c
Author: Juergen Spitzmueller <sp...@lyx.org>
Date: Wed Aug 8 09:31:46 2012 +0200
Complete default_language rc removal
diff --git a/lib/scripts/prefs2prefs_prefs.py b/lib/scripts/prefs2prefs_prefs.py
index 5d4a769..8e16899 100644
--- 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 d980c22..4669f68 100644
--- 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[] = {
-----------------------------------------------------------------------
Summary of changes:
lib/scripts/prefs2prefs_prefs.py | 12 +++++++++++-
src/LyXRC.cpp | 2 +-
2 files changed, 12 insertions(+), 2 deletions(-)
hooks/post-receive
--
The LyX Source Repository
