aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--core/locale.conf1
-rw-r--r--core/locales/locale.ar.conf1
-rw-r--r--core/locales/locale.de.conf1
-rw-r--r--core/locales/locale.es.conf1
-rw-r--r--core/locales/locale.fr.conf1
-rw-r--r--core/locales/locale.it.conf1
-rw-r--r--core/locales/locale.pl.conf1
-rw-r--r--core/locales/locale.ru.conf1
-rw-r--r--core/locales/locale.sv.conf1
-rw-r--r--core/locales/locale.zh.conf1
-rw-r--r--doc/manual.md18
-rw-r--r--modules/textadept/keys.lua6
-rw-r--r--modules/textadept/menu.lua1
-rw-r--r--test/test.lua3
14 files changed, 8 insertions, 30 deletions
diff --git a/core/locale.conf b/core/locale.conf
index 04859696..daca45fa 100644
--- a/core/locale.conf
+++ b/core/locale.conf
@@ -290,7 +290,6 @@ ASCII Encoding = _ASCII Encoding
CP-1252 Encoding = _CP-1252 Encoding
UTF-16 Encoding = UTF-1_6 Encoding
# Menu items for changing the way the current buffer is displayed.
-Toggle View EOL = Toggle View _EOL
Toggle Wrap Mode = Toggle _Wrap Mode
Toggle View Whitespace = Toggle View White_space
# Menu items for changing the syntax-highlighting language for the current
diff --git a/core/locales/locale.ar.conf b/core/locales/locale.ar.conf
index dec4e4f1..d06e584f 100644
--- a/core/locales/locale.ar.conf
+++ b/core/locales/locale.ar.conf
@@ -290,7 +290,6 @@ ASCII Encoding = ترميز الـASCII
CP-1252 Encoding = ترميز الـCP-1252
UTF-16 Encoding = ترميز الـUTF-1_6
# Menu items for changing the way the current buffer is displayed.
-Toggle View EOL = بدِّل عرض _نهاية السطر
Toggle Wrap Mode = بدِّل ال_تفاف النص
Toggle View Whitespace = بدِّل عرض ال_مسافة البيضاء
# Menu items for changing the syntax-highlighting language for the current
diff --git a/core/locales/locale.de.conf b/core/locales/locale.de.conf
index 6a7ea2c9..5966a755 100644
--- a/core/locales/locale.de.conf
+++ b/core/locales/locale.de.conf
@@ -290,7 +290,6 @@ ASCII Encoding = _ASCII
CP-1252 Encoding = _CP-1252
UTF-16 Encoding = UTF-1_6
# Menu items for changing the way the current buffer is displayed.
-Toggle View EOL = _EOL-Ansicht umschalten
Toggle Wrap Mode = Umbruchsmodus umschalten
Toggle View Whitespace = Leerzeichen ein-/ausblenden
# Menu items for changing the syntax-highlighting language for the current
diff --git a/core/locales/locale.es.conf b/core/locales/locale.es.conf
index ad8308fa..d52b29d3 100644
--- a/core/locales/locale.es.conf
+++ b/core/locales/locale.es.conf
@@ -290,7 +290,6 @@ ASCII Encoding = Codificación _ASCII
CP-1252 Encoding = Codificación _CP-1252
UTF-16 Encoding = Codificación UTF-_16
# Menu items for changing the way the current buffer is displayed.
-Toggle View EOL = _Mostrar/Ocultar fin de línea
Toggle Wrap Mode = _Activar/Desactivar ajuste de línea
Toggle View Whitespace = M_ostrar/Ocultar espacios en blanco
# Menu items for changing the syntax-highlighting language for the current
diff --git a/core/locales/locale.fr.conf b/core/locales/locale.fr.conf
index 6fdddcc9..786d2301 100644
--- a/core/locales/locale.fr.conf
+++ b/core/locales/locale.fr.conf
@@ -291,7 +291,6 @@ ASCII Encoding = Encodage _ASCII
CP-1252 Encoding = Encodage _CP-1252
UTF-16 Encoding = Encodage UTF-1_6
# Menu items for changing the way the current buffer is displayed.
-Toggle View EOL = Commuter l’affichage des fin de _ligne
Toggle Wrap Mode = Commuter le _retour à la ligne automatique
Toggle View Whitespace = Commuter l’affichage des _espaces
# Menu items for changing the syntax-highlighting language for the current
diff --git a/core/locales/locale.it.conf b/core/locales/locale.it.conf
index 7fd1dce2..48987955 100644
--- a/core/locales/locale.it.conf
+++ b/core/locales/locale.it.conf
@@ -290,7 +290,6 @@ ASCII Encoding = Codifica _ASCII
CP-1252 Encoding = Codifica _CP-1252
UTF-16 Encoding = Codifica UTF-1_6
# Menu items for changing the way the current buffer is displayed.
-Toggle View EOL = _Mostra la fine di linea sì/no
Toggle Wrap Mode = _Accapo automatico sì/no
Toggle View Whitespace = M_ostra gli spazi sì/no
# Menu items for changing the syntax-highlighting language for the current
diff --git a/core/locales/locale.pl.conf b/core/locales/locale.pl.conf
index 5ba98c4a..40e3a4c2 100644
--- a/core/locales/locale.pl.conf
+++ b/core/locales/locale.pl.conf
@@ -291,7 +291,6 @@ ASCII Encoding = _ASCII
CP-1252 Encoding = _CP-1252
UTF-16 Encoding = UTF-1_6
# Menu items for changing the way the current buffer is displayed.
-Toggle View EOL = Włącz/wyłącz znaki k_ońca linii
Toggle Wrap Mode = Włącz/wyłącz zawi_janie wierszy
Toggle View Whitespace = Włącz/wyłącz „_białe znaki”
# Menu items for changing the syntax-highlighting language for the current
diff --git a/core/locales/locale.ru.conf b/core/locales/locale.ru.conf
index 70307067..9a95168c 100644
--- a/core/locales/locale.ru.conf
+++ b/core/locales/locale.ru.conf
@@ -290,7 +290,6 @@ ASCII Encoding = Кодировка _ASCII
CP-1252 Encoding = Кодировка _CP-1252
UTF-16 Encoding = Кодировка UTF-1_6
# Menu items for changing the way the current buffer is displayed.
-Toggle View EOL = Переключить показ _EOL
Toggle Wrap Mode = Переключить режим _визуального переноса
Toggle View Whitespace = Переключить показ _пробелов
# Menu items for changing the syntax-highlighting language for the current
diff --git a/core/locales/locale.sv.conf b/core/locales/locale.sv.conf
index 2ff8616b..4ad12e3c 100644
--- a/core/locales/locale.sv.conf
+++ b/core/locales/locale.sv.conf
@@ -290,7 +290,6 @@ ASCII Encoding = AS_CII
CP-1252 Encoding = CP-_1252
UTF-16 Encoding = UTF-1_6
# Menu items for changing the way the current buffer is displayed.
-Toggle View EOL = Visa rad_brytningstecken
Toggle Wrap Mode = Växla _radbrytning
Toggle View Whitespace = Växla blan_ktecken
# Menu items for changing the syntax-highlighting language for the current
diff --git a/core/locales/locale.zh.conf b/core/locales/locale.zh.conf
index 9d532c85..eb1a7689 100644
--- a/core/locales/locale.zh.conf
+++ b/core/locales/locale.zh.conf
@@ -290,7 +290,6 @@ ASCII Encoding = _ASCII编码
CP-1252 Encoding = _CP-1252编码
UTF-16 Encoding = UTF-1_6编码
# Menu items for changing the way the current buffer is displayed.
-Toggle View EOL = 显示/隐藏_EOL
Toggle Wrap Mode = 自动换行(_W)
Toggle View Whitespace = 显示/隐藏空格(_S)
# Menu items for changing the syntax-highlighting language for the current
diff --git a/doc/manual.md b/doc/manual.md
index 3992c07d..a2d52098 100644
--- a/doc/manual.md
+++ b/doc/manual.md
@@ -397,12 +397,12 @@ Textadept shows the name of the active buffer in its titlebar. Pressing
### Typical Buffer Settings
Individual files have many configurable settings. Among the more useful settings
-are those involving line endings and their visibility, indentation settings,
-file encoding, long line wrapping, and the visibility of whitespace. Line
-endings are the characters that separate lines. Indentation consists of an
-indentation character (either a tab or a space) and an indentation size. File
-encoding specifies how to display text characters. Textadept shows these latter
-three settings among the contents of the buffer statusbar.
+are those involving line endings, indentation settings, file encoding, long line
+wrapping, and the visibility of whitespace. Line endings are the characters that
+separate lines. Indentation consists of an indentation character (either a tab
+or a space) and an indentation size. File encoding specifies how to display text
+characters. Textadept shows these latter three settings among the contents of
+the buffer statusbar.
![Document Statusbar](images/docstatusbar.png)
@@ -445,12 +445,6 @@ default, but does not alter the encoding of existing ones.
[`io.encodings`]: api.html#io.encodings
-#### View Line Endings
-
-Normally, EOL characters ("\r" and "\n") are invisible. Pressing
-`Ctrl+Alt+Enter` (`^↩` on macOS | none in the terminal) toggles their
-visibility.
-
#### View Long Lines
By default, lines with more characters than the view can show do not wrap into
diff --git a/modules/textadept/keys.lua b/modules/textadept/keys.lua
index c02bed9a..70ac2187 100644
--- a/modules/textadept/keys.lua
+++ b/modules/textadept/keys.lua
@@ -115,7 +115,6 @@ local M = {}
-- None |None |None |ASCII encoding
-- None |None |None |CP-1252 encoding
-- None |None |None |UTF-16 encoding
--- Ctrl+Alt+Enter |^↩ |None |Toggle view EOL
-- Ctrl+Alt+\\ |^\\ |None |Toggle wrap mode
-- Ctrl+Alt+Shift+S|^⇧S |None |Toggle view whitespace
-- Ctrl+Shift+L |⌘⇧L |M-S-L |Select lexer...
@@ -219,7 +218,7 @@ module('textadept.keys')]]
-- Unassigned keys (~ denotes keys reserved by the operating system):
-- c: C H I p Q T ~ V Y _ ) ] } +
-- a: aAbBcCdDeEfFgGhHiIjJkKlLmMnNoOpPqQrRsStTuUvVwWxXyYzZ_ ) ] } *+-/=\n\s
--- ca: aAbBcCdD F H jJkKlLmM N qQ t xXy zZ_"'()[]{}<>* / \s
+-- ca: aAbBcCdD F H jJkKlLmM N qQ t xXy zZ_"'()[]{}<>* / \n\s
--
-- c = 'ctrl' (Control ^)
-- a = 'alt' (Alt)
@@ -231,7 +230,7 @@ module('textadept.keys')]]
--
-- Unassigned keys (~ denotes keys reserved by the operating system):
-- m: C ~H I JkK ~M p ~ tT V yY _ ) ] } + ~~\n
--- c: cC D gG H J K L oO qQ xXyYzZ_ ) ] } * /
+-- c: cC D gG H J K L oO qQ xXyYzZ_ ) ] } * / \n
-- cm: aAbBcC~D F ~HiIjJkKlL~MnN p q~rRsStTuUvVwWxXyYzZ_"'()[]{}<>*+-/=\t\n
--
-- c = 'ctrl' (Control ^)
@@ -414,7 +413,6 @@ local bindings = {
-- TODO: m_buffer[_L['Encoding']][_L['ASCII Encoding']][2]
-- TODO: m_buffer[_L['Encoding']][_L['CP-1252 Encoding']][2]
-- TODO: m_buffer[_L['Encoding']][_L['UTF-16 Encoding']][2]
- [m_buffer[_L['Toggle View EOL']][2]] = {'ctrl+alt+\n', 'ctrl+\n', nil},
[m_buffer[_L['Toggle Wrap Mode']][2]] = {'ctrl+alt+\\', 'ctrl+\\', nil},
[m_buffer[_L['Toggle View Whitespace']][2]] = {'ctrl+alt+S', 'ctrl+S', nil},
[textadept.file_types.select_lexer] = {'ctrl+L', 'cmd+L', 'meta+L'},
diff --git a/modules/textadept/menu.lua b/modules/textadept/menu.lua
index 7a3e5465..b17c853f 100644
--- a/modules/textadept/menu.lua
+++ b/modules/textadept/menu.lua
@@ -288,7 +288,6 @@ local default_menubar = {
{_L['UTF-16 Encoding'], function() set_encoding('UTF-16LE') end}
},
SEPARATOR,
- {_L['Toggle View EOL'], function() view.view_eol = not view.view_eol end},
{_L['Toggle Wrap Mode'], function()
local first_visible_line = view.first_visible_line
local display_line = view:visible_from_doc_line(first_visible_line)
diff --git a/test/test.lua b/test/test.lua
index 0c46691e..2fea36b4 100644
--- a/test/test.lua
+++ b/test/test.lua
@@ -2516,9 +2516,6 @@ function test_menu_menu_functions()
local use_tabs = buffer.use_tabs
textadept.menu.menubar[_L['Buffer']][_L['Indentation']][_L['Toggle Use Tabs']][2]()
assert(buffer.use_tabs ~= use_tabs, 'use tabs not toggled')
- local view_eol = view.view_eol
- textadept.menu.menubar[_L['Buffer']][_L['Toggle View EOL']][2]()
- assert(view.view_eol ~= view_eol, 'view EOL not toggled')
local wrap_mode = view.wrap_mode
textadept.menu.menubar[_L['Buffer']][_L['Toggle Wrap Mode']][2]()
assert(view.wrap_mode ~= wrap_mode, 'wrap mode not toggled')
generated by cgit v1.2.3 (git 2.39.1) at 2025-08-08 20:02:09 +0000