Fix the fix

MAC-style (pre-OS X) line ends were not recognized anymore

diff --git a/lib/lyx2lyx/LyX.py b/lib/lyx2lyx/LyX.py
index 93006c34e1121dc1e9bcb77803ece69eebaa85fb..5ee8d5f4a8f61b759e82bf6fa26c9b1b38b4ed56 100644 (file)
--- a/lib/lyx2lyx/LyX.py
+++ b/lib/lyx2lyx/LyX.py
@@ -147,7 +147,7 @@ def get_backend(textclass):
 
 def trim_eol(line):
     " Remove end of line char(s)."
-    if line[-1] != '\n':
+    if line[-1] != '\n' and line[-1] != '\r':
         # May happen for the last line of a document
         return line
     if line[-2:-1] == '\r':