Skip to content

Commit

Permalink
Merge branch 't3900' into next. Incubates #3900
Browse files Browse the repository at this point in the history
  • Loading branch information
michaelDCurran committed Feb 20, 2014
2 parents 41e2ffc + 3d96315 commit 6b74306
Showing 1 changed file with 1 addition and 1 deletion.
2 changes: 1 addition & 1 deletion source/displayModel.py
Original file line number Diff line number Diff line change
Expand Up @@ -449,7 +449,7 @@ def _getLineOffsets(self,offset):
return startOffset,endOffset

def _get_clipboardText(self):
return super(DisplayModelTextInfo,self).clipboardText.replace('\0',' ')
return "\r\n".join(x.strip('\r\n') for x in self.getTextInChunks(textInfos.UNIT_LINE))

def getTextInChunks(self,unit):
#Specifically handle the line unit as we have the line offsets pre-calculated, and we can not guarantee lines end with \n
Expand Down

0 comments on commit 6b74306

Please sign in to comment.