aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--core/file_io.lua4
-rw-r--r--doc/manual.md6
2 files changed, 5 insertions, 5 deletions
diff --git a/core/file_io.lua b/core/file_io.lua
index 3b7be8c6..e5766c30 100644
--- a/core/file_io.lua
+++ b/core/file_io.lua
@@ -78,10 +78,10 @@ io.recent_files = {}
-- UTF-16BE, UTF-16LE, UTF-32, UTF-32BE, UTF-32LE, UTF-7, C99, JAVA.
--
-- [GNU iconv's encodings]: http://www.gnu.org/software/libiconv/
--- @usage io.encodings[#io.encodings + 1] = 'UTF-16'
+-- @usage io.encodings[#io.encodings + 1] = 'UTF-32'
-- @class table
-- @name encodings
-io.encodings = {'UTF-8', 'ASCII', 'ISO-8859-1'}
+io.encodings = {'UTF-8', 'ASCII', 'ISO-8859-1', 'UTF-16'}
---
-- Opens *filenames*, a string filename or list of filenames, or the
diff --git a/doc/manual.md b/doc/manual.md
index 72680572..a7d76f9d 100644
--- a/doc/manual.md
+++ b/doc/manual.md
@@ -412,9 +412,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, 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).
+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
+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