From: Eli Zaretskii <eliz@gnu.org>
Date: Sat, 14 Nov 2020 12:43:42 +0000 (+0200)
Subject: Make 'prefer-utf-8' heed inhibit-*-detection variables
X-Git-Tag: emacs-28.0.90~5156
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=29a59aad1c0a48a47bc340d75d82fcf118a7793f;p=emacs.git

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)
---

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.