summaryrefslogtreecommitdiff
path: root/lisp/international/mule-conf.el
diff options
context:
space:
mode:
authorEli Zaretskii <eliz@gnu.org>2020-11-14 14:43:42 +0200
committerEli Zaretskii <eliz@gnu.org>2020-11-14 14:43:42 +0200
commit29a59aad1c0a48a47bc340d75d82fcf118a7793f (patch)
tree2416e484b84f5192c8105a43f337be2baba90678 /lisp/international/mule-conf.el
parent206445a703d38102cf6f5ac44590e720f0dfe808 (diff)
downloademacs-29a59aad1c0a48a47bc340d75d82fcf118a7793f.tar.gz
emacs-29a59aad1c0a48a47bc340d75d82fcf118a7793f.tar.bz2
emacs-29a59aad1c0a48a47bc340d75d82fcf118a7793f.zip
Make 'prefer-utf-8' heed inhibit-*-detection variables
* lisp/international/mule-conf.el (prefer-utf-8): Inhibit detection of null bytes and ISO escape sequences if the respective inhibit-*-detection variables say so. (Bug#44486)
Diffstat (limited to 'lisp/international/mule-conf.el')
-rw-r--r--lisp/international/mule-conf.el4
1 files changed, 3 insertions, 1 deletions
diff --git a/lisp/international/mule-conf.el b/lisp/international/mule-conf.el
index 42dd19842c8..99449ad359f 100644
--- a/lisp/international/mule-conf.el
+++ b/lisp/international/mule-conf.el
@@ -1251,7 +1251,9 @@ by UTF-8."
:coding-type 'undecided
:mnemonic ?-
:charset-list '(emacs)
- :prefer-utf-8 t)
+ :prefer-utf-8 t
+ :inhibit-null-byte-detection 0
+ :inhibit-iso-escape-detection 0)
(define-coding-system 'raw-text
"Raw text, which means text contains random 8-bit codes.