Amend [7efdbeaddf226/lyxgit]

[features.git] / lib / lyx2lyx / LyX.py

diff --git a/lib/lyx2lyx/LyX.py b/lib/lyx2lyx/LyX.py
index ffaf4f0a63dbfe93aed8a71d834b2c3a2d629f25..50c98d2cd3f0e93451a427f4e14d07fb6de16156 100644 (file)
--- a/lib/lyx2lyx/LyX.py
+++ b/lib/lyx2lyx/LyX.py
@@ -294,7 +294,7 @@ class LyX_base:
         """ Emits warning to self.error, if the debug_level is less
         than the self.debug."""
         if debug_level <= self.debug:
-            self.err.write("Warning: " + message + "\n")
+            self.err.write("lyx2lyx warning: " + message + "\n")
 
 
     def error(self, message):
@@ -621,7 +621,7 @@ class LyX_base:
         modlist = self.get_module_list()
         if module not in modlist:
             return False
-        self.set_module_list([line for line in modlist if line != "ruby"])
+        self.set_module_list([line for line in modlist if line != module])
         return True
 
     def get_module_list(self):
@@ -797,8 +797,8 @@ class LyX_base:
                 # this should not happen
                 self.warning("Malformed LyX document! No \\language header found!")
                 return
-            self.header[k-1 : k-1] = ["\\begin_local_layout", "\\end_local_layout"]
-            i = k - 1
+            self.header[k : k] = ["\\begin_local_layout", "\\end_local_layout"]
+            i = k
 
         j = find_end_of(self.header, i, "\\begin_local_layout", "\\end_local_layout")
         if j == -1:
@@ -808,12 +808,12 @@ class LyX_base:
 
         self.header[i+1 : i+1] = new_layout
 
-    def del_local_layout(self, old_layout):
-        " Delete `old_layout` from local layouts, return success."
-        i = find_complete_lines(self.header, old_layout)
+    def del_local_layout(self, layout_def):
+        " Delete `layout_def` from local layouts, return success."
+        i = find_complete_lines(self.header, layout_def)
         if i == -1:
             return False
-        j = i+len(old_layout)
+        j = i+len(layout_def)
         if (self.header[i-1] == "\\begin_local_layout" and
             self.header[j] == "\\end_local_layout"):
             i -=1