2 files changed, 25 insertions, 0 deletions
diff --git a/core/ext/menu.lua b/core/ext/menu.lua
index 13f1913e..59b027b9 100644
--- a/core/ext/menu.lua
+++ b/core/ext/menu.lua
@@ -105,6 +105,9 @@ local ID = {
   TOGGLE_SHOW_INDENT_GUIDES = 505,
   TOGGLE_USE_TABS = 506,
   TOGGLE_VIEW_WHITESPACE = 507,
+  EOL_MODE_CRLF = 509,
+  EOL_MODE_CR = 510,
+  EOL_MODE_LF = 511,
   REFRESH_SYNTAX_HIGHLIGHTING = 508,
   -- Views
   NEXT_VIEW = 601,
@@ -307,6 +310,12 @@ t.menubar = {
     { l.MENU_BUF_TOGGLE_TABS, ID.TOGGLE_USE_TABS },
     { l.MENU_BUF_TOGGLE_VIEW_WHITESPACE, ID.TOGGLE_VIEW_WHITESPACE },
     { SEPARATOR, ID.SEPARATOR },
+    { title = l.MENU_BUF_EOL_MODE_TITLE,
+      { l.MENU_BUF_EOL_MODE_CRLF, ID.EOL_MODE_CRLF },
+      { l.MENU_BUF_EOL_MODE_CR, ID.EOL_MODE_CR },
+      { l.MENU_BUF_EOL_MODE_LF, ID.EOL_MODE_LF },
+    },
+    { SEPARATOR, ID.SEPARATOR },
     { l.MENU_BUF_REFRESH, ID.REFRESH_SYNTAX_HIGHLIGHTING },
   },
   gtkmenu {
@@ -405,6 +414,11 @@ local function toggle_setting(setting)
   end
   t.events.update_ui() -- for updating statusbar
 end
+local function set_eol_mode(mode)
+  buffer.eol_mode = mode
+  buffer:convert_eo_ls(mode)
+  t.events.update_ui() -- for updating statusbar
+end
 local function set_lexer_language(lexer)
   buffer:set_lexer_language(lexer)
   buffer:colourise(0, -1)
@@ -510,6 +524,9 @@ local actions = {
   [ID.TOGGLE_SHOW_INDENT_GUIDES] = { toggle_setting, 'indentation_guides' },
   [ID.TOGGLE_USE_TABS] = { toggle_setting, 'use_tabs' },
   [ID.TOGGLE_VIEW_WHITESPACE] = { toggle_setting, 'view_ws' },
+  [ID.EOL_MODE_CRLF] = { set_eol_mode, 0 },
+  [ID.EOL_MODE_CR] = { set_eol_mode, 1 },
+  [ID.EOL_MODE_LF] = { set_eol_mode, 2 },
   [ID.REFRESH_SYNTAX_HIGHLIGHTING] = { 'colourise', b, 0, -1 },
   -- Views
   [ID.NEXT_VIEW] = { t.goto_view, 1, false },
diff --git a/core/locale.lua b/core/locale.lua
index 52db58b9..6cfb8f85 100644
--- a/core/locale.lua
+++ b/core/locale.lua
@@ -303,6 +303,14 @@ MENU_BUF_TOGGLE_INDENT_GUIDES = 'Toggle Show _Indentation Guides'
 MENU_BUF_TOGGLE_TABS = 'Toggle Use _Tabs'
 -- Toggle View White_space
 MENU_BUF_TOGGLE_VIEW_WHITESPACE = 'Toggle View White_space'
+-- EOL Mode
+MENU_BUF_EOL_MODE_TITLE = 'EOL Mode'
+-- CR+LF
+MENU_BUF_EOL_MODE_CRLF = 'CR+LF'
+-- CR
+MENU_BUF_EOL_MODE_CR = 'CR'
+-- LF
+MENU_BUF_EOL_MODE_LF = 'LF'
 -- _Refresh Syntax Highlighting
 MENU_BUF_REFRESH = '_Refresh Syntax Highlighting'