# HG changeset patch # User Torsten Lilge # Date 1582842150 -3600 # Node ID 33d89d314d4332f7ec49501e75366cef5bba65e7 # Parent e82d00e8be373acf278c7191f49edb440a3b6be5 prevent removing all spaces instead of trailing ones (bug #57861) * file-editor-tab.cc (eol_string): return an end of file string in any case; (handle_save_file_as_answer, handle_save_file_as_answer_close): remove use of uninitialzed variables that were used when the eol mode was configurable while saving the file diff -r e82d00e8be37 -r 33d89d314d43 libgui/src/m-editor/file-editor-tab.cc --- a/libgui/src/m-editor/file-editor-tab.cc Wed Feb 26 13:29:01 2020 -0500 +++ b/libgui/src/m-editor/file-editor-tab.cc Thu Feb 27 23:22:30 2020 +0100 @@ -2018,7 +2018,8 @@ return ("\n"); } - return QString (); + // Last resort, if the above goes wrong (should never happen) + return ("\r\n"); } void file_editor_tab::update_eol_indicator (void) @@ -2532,9 +2533,6 @@ void file_editor_tab::handle_save_file_as_answer (const QString& saveFileName) { - if (m_save_as_desired_eol != m_edit_area->eolMode ()) - convert_eol (this,m_save_as_desired_eol); - if (saveFileName == m_file_name) { save_file (saveFileName); @@ -2551,13 +2549,6 @@ void file_editor_tab::handle_save_file_as_answer_close (const QString& saveFileName) { - if (m_save_as_desired_eol != m_edit_area->eolMode ()) - { - m_edit_area->setReadOnly (false); // was set to read-only in save_file_as - convert_eol (this,m_save_as_desired_eol); - m_edit_area->setReadOnly (true); // restore read-only mode - } - // saveFileName == m_file_name can not happen, because we only can get here // when we close a tab and m_file_name is not a valid filename yet