aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--core/file_io.lua2
-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--doc/manual.md6
-rw-r--r--modules/textadept/keys.lua2
-rw-r--r--modules/textadept/menu.lua1
13 files changed, 4 insertions, 16 deletions
diff --git a/core/file_io.lua b/core/file_io.lua
index cf364305..8493cb3e 100644
--- a/core/file_io.lua
+++ b/core/file_io.lua
@@ -81,7 +81,7 @@ io.recent_files = {}
-- @usage io.encodings[#io.encodings + 1] = 'UTF-16'
-- @class table
-- @name encodings
-io.encodings = {'UTF-8', 'ASCII', 'ISO-8859-1', 'MacRoman'}
+io.encodings = {'UTF-8', 'ASCII', 'ISO-8859-1'}
---
-- Opens *filenames*, a string filename or list of filenames, or the
diff --git a/core/locale.conf b/core/locale.conf
index 8b77d7e8..7aa9a49e 100644
--- a/core/locale.conf
+++ b/core/locale.conf
@@ -280,7 +280,6 @@ E_ncoding = E_ncoding
_UTF-8 Encoding = _UTF-8 Encoding
_ASCII Encoding = _ASCII Encoding
_ISO-8859-1 Encoding = _ISO-8859-1 Encoding
-_MacRoman Encoding = _MacRoman Encoding
UTF-1_6 Encoding = UTF-1_6 Encoding
# Menu items for changing the way the current buffer is displayed.
Toggle View _EOL = Toggle View _EOL
diff --git a/core/locales/locale.ar.conf b/core/locales/locale.ar.conf
index 7c620389..f6e9dd57 100644
--- a/core/locales/locale.ar.conf
+++ b/core/locales/locale.ar.conf
@@ -280,7 +280,6 @@ E_ncoding = ال_ترميز
_UTF-8 Encoding = ترميز الـUTF-8
_ASCII Encoding = ترميز الـASCII
_ISO-8859-1 Encoding = ترميز الـISO-8859-1
-_MacRoman Encoding = ترميز الـMacRoman
UTF-1_6 Encoding = ترميز الـUTF-1_6
# Menu items for changing the way the current buffer is displayed.
Toggle View _EOL = بدِّل عرض _نهاية السطر
diff --git a/core/locales/locale.de.conf b/core/locales/locale.de.conf
index e6992c7a..e01288cf 100644
--- a/core/locales/locale.de.conf
+++ b/core/locales/locale.de.conf
@@ -280,7 +280,6 @@ E_ncoding = Zeichenkodierung
_UTF-8 Encoding = _UTF-8
_ASCII Encoding = _ASCII
_ISO-8859-1 Encoding = _ISO-8859-1
-_MacRoman Encoding = _MacRoman
UTF-1_6 Encoding = UTF-1_6
# Menu items for changing the way the current buffer is displayed.
Toggle View _EOL = _EOL-Ansicht umschalten
diff --git a/core/locales/locale.es.conf b/core/locales/locale.es.conf
index 83b9c47a..72bff229 100644
--- a/core/locales/locale.es.conf
+++ b/core/locales/locale.es.conf
@@ -280,7 +280,6 @@ E_ncoding = C_odificación
_UTF-8 Encoding = Codificación UTF-_8
_ASCII Encoding = Codificación _ASCII
_ISO-8859-1 Encoding = Codificación _ISO-8859-1
-_MacRoman Encoding = Codificación _MacRoman
UTF-1_6 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
diff --git a/core/locales/locale.fr.conf b/core/locales/locale.fr.conf
index 3e629ffc..8740fbe8 100644
--- a/core/locales/locale.fr.conf
+++ b/core/locales/locale.fr.conf
@@ -281,7 +281,6 @@ E_ncoding = E_ncodage
_UTF-8 Encoding = Encodage _UTF-8
_ASCII Encoding = Encodage _ASCII
_ISO-8859-1 Encoding = Encodage _ISO-8859-1
-_MacRoman Encoding = Encodage _MacRoman
UTF-1_6 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
diff --git a/core/locales/locale.it.conf b/core/locales/locale.it.conf
index f5981433..2070d66f 100644
--- a/core/locales/locale.it.conf
+++ b/core/locales/locale.it.conf
@@ -280,7 +280,6 @@ E_ncoding = _Codifica
_UTF-8 Encoding = Codifica _UTF-8
_ASCII Encoding = Codifica _ASCII
_ISO-8859-1 Encoding = Codifica _ISO-8859-1
-_MacRoman Encoding = Codifica _MacRoman
UTF-1_6 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
diff --git a/core/locales/locale.pl.conf b/core/locales/locale.pl.conf
index e0a4eae0..6911778e 100644
--- a/core/locales/locale.pl.conf
+++ b/core/locales/locale.pl.conf
@@ -280,7 +280,6 @@ E_ncoding = Ko_dowanie znaków
_UTF-8 Encoding = _UTF-8
_ASCII Encoding = _ASCII
_ISO-8859-1 Encoding = _ISO-8859-1
-_MacRoman Encoding = _MacRoman
UTF-1_6 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
diff --git a/core/locales/locale.ru.conf b/core/locales/locale.ru.conf
index 4486db74..55a4f4ef 100644
--- a/core/locales/locale.ru.conf
+++ b/core/locales/locale.ru.conf
@@ -280,7 +280,6 @@ E_ncoding = _Кодировка
_UTF-8 Encoding = Кодировка _UTF-8
_ASCII Encoding = Кодировка _ASCII
_ISO-8859-1 Encoding = Кодировка _ISO-8859-1
-_MacRoman Encoding = Кодировка _MacRoman
UTF-1_6 Encoding = Кодировка UTF-1_6
# Menu items for changing the way the current buffer is displayed.
Toggle View _EOL = Переключить показ _EOL
diff --git a/core/locales/locale.sv.conf b/core/locales/locale.sv.conf
index 99e74a08..0677f5b0 100644
--- a/core/locales/locale.sv.conf
+++ b/core/locales/locale.sv.conf
@@ -280,7 +280,6 @@ E_ncoding = Tecken_kodning
_UTF-8 Encoding = UTF-_8
_ASCII Encoding = AS_CII
_ISO-8859-1 Encoding = ISO-8859-_1
-_MacRoman Encoding = _MacRoman
UTF-1_6 Encoding = UTF-1_6
# Menu items for changing the way the current buffer is displayed.
Toggle View _EOL = Visa rad_brytningstecken
diff --git a/doc/manual.md b/doc/manual.md
index da8dd233..2bc1babe 100644
--- a/doc/manual.md
+++ b/doc/manual.md
@@ -411,9 +411,9 @@ manually sets indentation size.
#### Buffer Encodings
Textadept has the ability to decode files encoded in many different encodings,
-but by default it only attempts to decode UTF-8, ASCII, ISO-8859-1, and
-MacRoman. If you work with files with encodings Textadept does not recognize,
-add those encodings to [`io.encodings`][] in your [preferences](#Preferences).
+but by default it only attempts to decode UTF-8, ASCII, and ISO-8859-1. If you
+work with files with encodings Textadept does not recognize, add those encodings
+to [`io.encodings`][] in your [preferences](#Preferences).
UTF-8 is the recommended file encoding because of its wide support by other text
editors and operating systems. The "Buffer -> Encoding" menu changes the file
diff --git a/modules/textadept/keys.lua b/modules/textadept/keys.lua
index 7701f772..8221a5d4 100644
--- a/modules/textadept/keys.lua
+++ b/modules/textadept/keys.lua
@@ -115,7 +115,6 @@ local M = {}
-- None |None |None |UTF-8 encoding
-- None |None |None |ASCII encoding
-- None |None |None |ISO-8859-1 encoding
--- None |None |None |MacRoman encoding
-- None |None |None |UTF-16 encoding
-- Ctrl+Shift+L |⌘⇧L |M-S-L |Select lexer...
-- F5 |F5 |^L<br/>F5 |Refresh syntax highlighting
@@ -447,7 +446,6 @@ keys[not OSX and (GUI and 'cai' or 'mi')
-- TODO: m_buffer[_L['E_ncoding']][_L['_UTF-8 Encoding']][2]
-- TODO: m_buffer[_L['E_ncoding']][_L['_ASCII Encoding']][2]
-- TODO: m_buffer[_L['E_ncoding']][_L['_ISO-8859-1 Encoding']][2]
--- TODO: m_buffer[_L['E_ncoding']][_L['_MacRoman Encoding']][2]
-- TODO: m_buffer[_L['E_ncoding']][_L['UTF-1_6 Encoding']][2]
if GUI then
keys[not OSX and 'ca\n' or 'c\n'] = m_buffer[_L['Toggle View _EOL']][2]
diff --git a/modules/textadept/menu.lua b/modules/textadept/menu.lua
index e95cd287..03dd5a49 100644
--- a/modules/textadept/menu.lua
+++ b/modules/textadept/menu.lua
@@ -284,7 +284,6 @@ local default_menubar = {
{_L['_UTF-8 Encoding'], function() set_encoding('UTF-8') end},
{_L['_ASCII Encoding'], function() set_encoding('ASCII') end},
{_L['_ISO-8859-1 Encoding'], function() set_encoding('ISO-8859-1') end},
- {_L['_MacRoman Encoding'], function() set_encoding('MacRoman') end},
{_L['UTF-1_6 Encoding'], function() set_encoding('UTF-16LE') end}
},
SEPARATOR,
generated by cgit v1.2.3 (git 2.39.1) at 2025-08-09 05:50:17 +0000