Kiln » TortoiseHg » TortoiseHg
Clone URL:  
Pushed to one repository · View In Graph Contained in 1.9.2, 1.9.3, and 2.0

qscilib: use existing eoln mode for newly added lines in fileEditor

Also, fix the error dialog.

Changeset 04da935d01fe…

Parent 24a354d1895b…

by Steve Borho

Changes to one file · Browse files at 04da935d01fe Showing diff from parent 24a354d1895b Diff from another changeset...

Change 1 of 2 Show Entire File tortoisehg/​hgqt/​qscilib.py Stacked
 
445
446
447
 
 
 
 
448
449
450
 
454
455
456
457
 
458
 
445
446
447
448
449
450
451
452
453
454
 
458
459
460
 
461
462
@@ -445,6 +445,10 @@
  geomname = 'editor-geom'   editor.setText(contents)   editor.setModified(False) + if '\r\n' in contents: + editor.setEolMode(QsciScintilla.EolWindows) + else: + editor.setEolMode(QsciScintilla.EolUnix)   dialog.restoreGeometry(s.value(geomname).toByteArray())   ret = dialog.exec_()   if ret == QDialog.Accepted: @@ -454,5 +458,5 @@
  s.setValue(geomname, dialog.saveGeometry())   except EnvironmentError, e:   qtlib.WarningMsgBox(_('Unable to read/write config file'), - hglib.tounicode(e), parent=dialog) + hglib.tounicode(str(e)), parent=dialog)   return ret