diff options
| author | Glenn Morris <rgm@gnu.org> | 2018-08-26 15:10:50 -0700 |
|---|---|---|
| committer | Glenn Morris <rgm@gnu.org> | 2018-08-26 15:10:50 -0700 |
| commit | 1afd313334c93cb5b0a7a378bd635a54dc1d6a9e (patch) | |
| tree | cb95ad44d35f9b32a8acc8bb00b7291f38549c52 /lisp/international/mule-conf.el | |
| parent | 18d52b90a1692a47cea5b5e905a58a3b2c6c9a64 (diff) | |
| parent | 54fb383af6f6af7b72c28f38b308d9b24d2af4f6 (diff) | |
| download | emacs-1afd313334c93cb5b0a7a378bd635a54dc1d6a9e.tar.gz | |
Merge from origin/emacs-26
54fb383 (origin/emacs-26) Fix detection of freed emacs_values (Bug#32...
769d0cd ; Fix out-of-tree build for mod-test.so
9a1329e Avoid crashes with very wide TTY frames on MS-Windows
9a613d3 Prevent `modify-file-local-variable-prop-line' from adding ex...
624e7dc Update GNOME bugtracker URLs
51ef6d5 Clarify in the Emacs manual that ChangeLog files are not used
6e08019 Recognize codepage 65001 as a valid encoding
1a350d7 ; * etc/NEWS: Fix format of first lines of some entries.
22d1f53 Avoid compilation warning in nt/addpm.c
7bc9ce7 Fix duplicate custom group names in bibtex.el
a9cf938 Fix outdated text in the Calc manual
Conflicts:
etc/NEWS
etc/PROBLEMS
src/emacs-module.c
src/gtkutil.c
src/image.c
src/xterm.c
test/Makefile.in
Diffstat (limited to 'lisp/international/mule-conf.el')
| -rw-r--r-- | lisp/international/mule-conf.el | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/lisp/international/mule-conf.el b/lisp/international/mule-conf.el index 3affeec03ea..b08150a1499 100644 --- a/lisp/international/mule-conf.el +++ b/lisp/international/mule-conf.el @@ -1304,6 +1304,11 @@ is treated as a character." :bom '(utf-8-with-signature . utf-8)) (define-coding-system-alias 'mule-utf-8 'utf-8) +;; See this page: +;; https://docs.microsoft.com/en-us/windows/desktop/intl/code-page-identifiers +;; Starting with Windows 10, people are trying to set their systems to +;; use UTF-8 , so we had better recognized this alias: +(define-coding-system-alias 'cp65001 'utf-8) (define-coding-system 'utf-8-emacs "Support for all Emacs characters (including non-Unicode characters)." |