From ed91aa74ec7dacf3d4f7f794ac571bd7ffcc8cc0 Mon Sep 17 00:00:00 2001
From: mitchell <70453897+667e-11@users.noreply.github.com>
Date: Tue, 30 Jul 2019 16:52:48 -0400
Subject: Use CP1252 instead of ISO-8859-1. CP1252 is a superset of ISO-8859-1.

---
 CHANGELOG.md                | 2 +-
 core/file_io.lua            | 2 +-
 core/locale.conf            | 2 +-
 core/locales/locale.ar.conf | 2 +-
 core/locales/locale.de.conf | 2 +-
 core/locales/locale.es.conf | 2 +-
 core/locales/locale.fr.conf | 2 +-
 core/locales/locale.it.conf | 2 +-
 core/locales/locale.pl.conf | 2 +-
 core/locales/locale.ru.conf | 2 +-
 core/locales/locale.sv.conf | 2 +-
 core/locales/locale.zh.conf | 2 +-
 doc/manual.md               | 4 ++--
 modules/textadept/keys.lua  | 4 ++--
 modules/textadept/menu.lua  | 2 +-
 15 files changed, 17 insertions(+), 17 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index b6abe64c..ba07a6fe 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -22,7 +22,7 @@ Download:
 Bugfixes:
 
 * Do not advance the caret on failed incremental find.
-* Fixed bug with filters that have extension includes and pattern excludes
+* Fixed bug with filters that have extension includes and pattern excludes.
 
 Changes:
 
diff --git a/core/file_io.lua b/core/file_io.lua
index 72c86e3d..283b2846 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-32'
 -- @class table
 -- @name encodings
-io.encodings = {'UTF-8', 'ASCII', 'ISO-8859-1', 'UTF-16'}
+io.encodings = {'UTF-8', 'ASCII', 'CP1252', 'UTF-16'}
 
 ---
 -- Opens *filenames*, a string filename or list of filenames, or the
diff --git a/core/locale.conf b/core/locale.conf
index 25ba82ae..1582dc96 100644
--- a/core/locale.conf
+++ b/core/locale.conf
@@ -294,7 +294,7 @@ _EOL Mode = _EOL Mode
 E_ncoding = E_ncoding
 _UTF-8 Encoding = _UTF-8 Encoding
 _ASCII Encoding = _ASCII Encoding
-_ISO-8859-1 Encoding = _ISO-8859-1 Encoding
+_CP-1252 Encoding = _CP-1252 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 9b450e36..3837cae5 100644
--- a/core/locales/locale.ar.conf
+++ b/core/locales/locale.ar.conf
@@ -294,7 +294,7 @@ _EOL Mode = _علامة نهاية السطر(EOL)
 E_ncoding = ال_ترميز
 _UTF-8 Encoding = ترميز الـUTF-8
 _ASCII Encoding = ترميز الـASCII
-_ISO-8859-1 Encoding = ترميز الـISO-8859-1
+_CP-1252 Encoding = ترميز الـCP-1252
 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 67b5c317..899de6ca 100644
--- a/core/locales/locale.de.conf
+++ b/core/locales/locale.de.conf
@@ -295,7 +295,7 @@ _EOL Mode = _EOL-Modus
 E_ncoding = Zeichenkodierung
 _UTF-8 Encoding = _UTF-8
 _ASCII Encoding = _ASCII
-_ISO-8859-1 Encoding = _ISO-8859-1
+_CP-1252 Encoding = _CP-1252
 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 c196229a..6e46e6e0 100644
--- a/core/locales/locale.es.conf
+++ b/core/locales/locale.es.conf
@@ -294,7 +294,7 @@ _EOL Mode = Ca_rácter fin de línea
 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
+_CP-1252 Encoding = Codificación _CP-1252
 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 4a79276b..e62bd07d 100644
--- a/core/locales/locale.fr.conf
+++ b/core/locales/locale.fr.conf
@@ -295,7 +295,7 @@ _EOL Mode = _Fin de ligne
 E_ncoding = E_ncodage
 _UTF-8 Encoding = Encodage _UTF-8
 _ASCII Encoding = Encodage _ASCII
-_ISO-8859-1 Encoding = Encodage _ISO-8859-1
+_CP-1252 Encoding = Encodage _CP-1252
 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 f5c76267..ff8843c8 100644
--- a/core/locales/locale.it.conf
+++ b/core/locales/locale.it.conf
@@ -294,7 +294,7 @@ _EOL Mode = _Tipo di fine di linea
 E_ncoding = _Codifica
 _UTF-8 Encoding = Codifica _UTF-8
 _ASCII Encoding = Codifica _ASCII
-_ISO-8859-1 Encoding = Codifica _ISO-8859-1
+_CP-1252 Encoding = Codifica _CP-1252
 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 291c79c2..1c85d80e 100644
--- a/core/locales/locale.pl.conf
+++ b/core/locales/locale.pl.conf
@@ -295,7 +295,7 @@ _EOL Mode = _Tryb końca linii
 E_ncoding = Ko_dowanie znaków
 _UTF-8 Encoding = _UTF-8
 _ASCII Encoding = _ASCII
-_ISO-8859-1 Encoding = _ISO-8859-1
+_CP-1252 Encoding = _CP-1252
 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 ea5ba5a2..8f079989 100644
--- a/core/locales/locale.ru.conf
+++ b/core/locales/locale.ru.conf
@@ -294,7 +294,7 @@ _EOL Mode = Режим _конца строки
 E_ncoding = _Кодировка
 _UTF-8 Encoding = Кодировка _UTF-8
 _ASCII Encoding = Кодировка _ASCII
-_ISO-8859-1 Encoding = Кодировка _ISO-8859-1
+_CP-1252 Encoding = Кодировка _CP-1252
 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 e5956551..76306645 100644
--- a/core/locales/locale.sv.conf
+++ b/core/locales/locale.sv.conf
@@ -294,7 +294,7 @@ _EOL Mode = Ra_dbrytningstecken
 E_ncoding = Tecken_kodning
 _UTF-8 Encoding = UTF-_8
 _ASCII Encoding = AS_CII
-_ISO-8859-1 Encoding = ISO-8859-_1
+_CP-1252 Encoding = CP-_1252
 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/core/locales/locale.zh.conf b/core/locales/locale.zh.conf
index 70cfdc6d..b90edd54 100644
--- a/core/locales/locale.zh.conf
+++ b/core/locales/locale.zh.conf
@@ -294,7 +294,7 @@ _EOL Mode = _EOL模式
 E_ncoding = 编码(_N)
 _UTF-8 Encoding = _UTF-8编码
 _ASCII Encoding = _ASCII编码
-_ISO-8859-1 Encoding = _ISO-8859-1编码
+_CP-1252 Encoding = _CP-1252编码
 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/doc/manual.md b/doc/manual.md
index 73fdcf9f..64e9608f 100644
--- a/doc/manual.md
+++ b/doc/manual.md
@@ -389,8 +389,8 @@ 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 UTF-16.
-If you work with files with encodings Textadept does not recognize, add those
+but by default it only attempts to decode UTF-8, ASCII, CP-1252, and UTF-16. 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
diff --git a/modules/textadept/keys.lua b/modules/textadept/keys.lua
index 5724ff42..0d66cbec 100644
--- a/modules/textadept/keys.lua
+++ b/modules/textadept/keys.lua
@@ -112,7 +112,7 @@ local M = {}
 -- None            |None  |None         |LF EOL mode
 -- None            |None  |None         |UTF-8 encoding
 -- None            |None  |None         |ASCII encoding
--- None            |None  |None         |ISO-8859-1 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
@@ -439,7 +439,7 @@ keys[not OSX and (GUI and 'cai' or 'mi')
 -- Encoding.
 -- 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['_CP-1252 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 bbfe6d33..2cd738d3 100644
--- a/modules/textadept/menu.lua
+++ b/modules/textadept/menu.lua
@@ -289,7 +289,7 @@ local default_menubar = {
       title = _L['E_ncoding'],
       {_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['_CP-1252 Encoding'], function() set_encoding('CP1252') end},
       {_L['UTF-1_6 Encoding'], function() set_encoding('UTF-16LE') end}
     },
     SEPARATOR,
-- 
cgit v1.2.3