Reproog/novelWriter
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Consitent end of file line endings for merge and split tools

Browse Source
This commit is contained in:
Veronica K. B. Olsen
2020-05-30 13:17:21 +02:00
parent bee82dd735
commit ee5cdc1d41
2 changed files with 2 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
nw/gui/dialogs/docmerge.py
+1 -1
View File
@@ -106,7 +106,7 @@ class GuiDocMerge(QDialog):
theDoc = NWDoc(self.theProject, self.theParent) theDoc = NWDoc(self.theProject, self.theParent)
theText = "" theText = ""
for tHandle in finalOrder: for tHandle in finalOrder:
theText += theDoc.openDocument(tHandle, False).rstrip() theText += theDoc.openDocument(tHandle, False).rstrip("\n")
theText += "\n\n" theText += "\n\n"
if self.sourceItem is None: if self.sourceItem is None:
nw/gui/dialogs/docsplit.py
+1
View File
@@ -182,6 +182,7 @@ class GuiDocSplit(QDialog):
) )
theText = "\n".join(theLines[iStart:iEnd]) theText = "\n".join(theLines[iStart:iEnd])
theText = theText.rstrip("\n") + "\n\n"
theDoc.openDocument(nHandle, False) theDoc.openDocument(nHandle, False)
theDoc.saveDocument(theText) theDoc.saveDocument(theText)
theDoc.clearDocument() theDoc.clearDocument()