Mercurial Repositories > eric / file diff

diff -r dcaebdef6f4a -r e96fd56843d3 Project/Project.py
--- a/Project/Project.py	Thu Sep 05 18:11:19 2013 +0200
+++ b/Project/Project.py	Thu Sep 05 18:15:10 2013 +0200
@@ -19,6 +19,7 @@
     QByteArray, QObject, Qt
 from PyQt4.QtGui import QCursor, QLineEdit, QToolBar, QDialog, QInputDialog, \
     QApplication, QMenu, QAction
+from PyQt4.Qsci import QsciScintilla
 
 from E5Gui.E5Application import e5App
 from E5Gui import E5FileDialog, E5MessageBox
@@ -401,7 +402,7 @@
         self.pdata["PACKAGERSPARMS"] = {}
         self.pdata["DOCUMENTATIONPARMS"] = {}
         self.pdata["OTHERTOOLSPARMS"] = {}
-        self.pdata["EOL"] = [0]
+        self.pdata["EOL"] = [-1]
         
         self.__initDebugProperties()
         
@@ -2969,7 +2970,19 @@
         
         @return eol string (string)
         """
-        return self.eols[self.pdata["EOL"][0]]
+        if self.pdata["EOL"][0] >= 0:
+            return self.eols[self.pdata["EOL"][0]]
+        else:
+            eolMode = Preferences.getEditor("EOLMode")
+            if eolMode == QsciScintilla.EolWindows:
+                eol = '\r\n'
+            elif eolMode == QsciScintilla.EolUnix:
+                eol = '\n'
+            elif eolMode == QsciScintilla.EolMac:
+                eol = '\r'
+            else:
+                eol = os.linesep
+            return eol
         
     def useSystemEol(self):
         """