master 29a59aa: Make 'prefer-utf-8' heed inhibit-*-detection variables

[Eli Zaretskii]

branch: master
commit 29a59aad1c0a48a47bc340d75d82fcf118a7793f
Author: Eli Zaretskii <eliz@gnu.org>
Commit: Eli Zaretskii <eliz@gnu.org>

    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)
---
 lisp/international/mule-conf.el | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/lisp/international/mule-conf.el b/lisp/international/mule-conf.el
index 42dd198..99449ad 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.