Mercurial > octave

changeset 26518:80e69933b6c0 stable

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Use LF as default EOL character on MacOS. * file-editor-tab.cc (detect_eol_mode, new_file), settings_dialog.cc: Remove special case for MacOS.
author Markus Mützel <markus.muetzel@gmx.de>
date Thu, 10 Jan 2019 20:15:15 +0100
parents 826d4c26e5e2
children 9ed51ca68352
files libgui/src/m-editor/file-editor-tab.cc libgui/src/settings-dialog.cc
diffstat 2 files changed, 2 insertions(+), 8 deletions(-) [+]
line wrap: on
line diff
--- a/libgui/src/m-editor/file-editor-tab.cc	Thu Jan 10 18:45:49 2019 +0100
+++ b/libgui/src/m-editor/file-editor-tab.cc	Thu Jan 10 20:15:15 2019 +0100
@@ -1901,8 +1901,6 @@
     // get default from OS or from settings
 #if defined (Q_OS_WIN32)
     int os_eol_mode = QsciScintilla::EolWindows;
-#elif defined (Q_OS_MAC)
-    int os_eol_mode = QsciScintilla::EolMac;
 #else
     int os_eol_mode = QsciScintilla::EolUnix;
 #endif
@@ -1988,8 +1986,6 @@
     // missing in the settings
 #if defined (Q_OS_WIN32)
     int eol_mode = QsciScintilla::EolWindows;
-#elif defined (Q_OS_MAC)
-    int eol_mode = QsciScintilla::EolMac;
 #else
     int eol_mode = QsciScintilla::EolUnix;
 #endif
--- a/libgui/src/settings-dialog.cc	Thu Jan 10 18:45:49 2019 +0100
+++ b/libgui/src/settings-dialog.cc	Thu Jan 10 20:15:15 2019 +0100
@@ -329,11 +329,9 @@
 #if defined (HAVE_QSCINTILLA)
 #  if defined (Q_OS_WIN32)
     int eol_mode = QsciScintilla::EolWindows;
-#elif defined (Q_OS_MAC)
-    int eol_mode = QsciScintilla::EolMac;
-#else
+#  else
     int eol_mode = QsciScintilla::EolUnix;
-#endif
+#  endif
 #else
     int eol_mode = 2;
 #endif