changeset 29653:431420b46342

maint: merge stable to default.
author Markus Mützel <markus.muetzel@gmx.de>
date Wed, 12 May 2021 18:50:04 +0200
parents b4e2e6f64db0 (current diff) 5068a97f0f39 (diff)
children 32f4357ac8d9
files libgui/src/m-editor/file-editor-tab.cc
diffstat 1 files changed, 3 insertions(+), 0 deletions(-) [+]
line wrap: on
line diff
--- a/libgui/src/m-editor/file-editor-tab.cc	Wed May 12 17:57:08 2021 +0200
+++ b/libgui/src/m-editor/file-editor-tab.cc	Wed May 12 18:50:04 2021 +0200
@@ -2689,6 +2689,9 @@
 
     m_edit_area->setEolVisibility (settings->value (ed_show_eol_chars).toBool ());
 
+    m_save_as_desired_eol = static_cast<QsciScintilla::EolMode>
+                              (settings->value (ed_default_eol_mode).toInt ());
+
     if (settings->value (ed_show_line_numbers).toBool ())
       {
         m_edit_area->setMarginLineNumbers (2, true);