Update manual from Ignatio

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

diff --git a/lib/scripts/prefs2prefs.py b/lib/scripts/prefs2prefs.py
index bdbc7e327a90646dced7c0a0c79c2ce7b6bab5ae..5bc25c1b142289fe89f4c334268ddbfe290242dc 100644 (file)
--- a/lib/scripts/prefs2prefs.py
+++ b/lib/scripts/prefs2prefs.py
@@ -100,16 +100,16 @@ def update_format(lines):
        " Writes new format line "
        (found, format_line) = find_format_line(lines)
        if not found:
-               lines.insert(format_line, "Format 1")
+               lines[format_line:format_line] = ("Format 1", "")
                return
 
        line = lines[format_line]
-       m = re_format.search(l)
+       m = re_format.search(line)
        if not m:
                sys.stderr.write("Couldn't match format line!\n" + line + "\n")
                sys.exit(1)
        format = int(m.group(1))
-       lines[i] = "Format " + str(format + 1)
+       lines[format_line] = "Format " + str(format + 1)
 
 
 #
@@ -149,15 +149,16 @@ def main(argv):
 
        for (opt, param) in options:
                if opt == "-l":
-                       from prefs2prefs_lfuns import conversions, current_format
+                       from prefs2prefs_lfuns import conversions
                elif opt == "-p":
-                       from prefs2prefs_prefs import conversions, current_format
+                       from prefs2prefs_prefs import conversions
        
        if not conversions:
                usage()
                print "\nNeither -l nor -p given"
                sys.exit(1)
 
+       current_format = len(conversions)
        lines = read(source)
        format = get_format(lines)