From: Glenn Morris <rgm@gnu.org>
Date: Sat, 7 Nov 2020 17:57:56 +0000 (-0800)
Subject: Merge from origin/emacs-27
X-Git-Tag: emacs-28.0.90~5213^2~5
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=6b63b6669d51331381063781dd28bb02a26d3d04;p=emacs.git

Merge from origin/emacs-27

53933cdf5c ; * lisp/international/mule.el (define-coding-system): Doc...
e90ffcf759 * src/w32fns.c (Fw32_register_hot_key): Doc fix.  (Bug#44456)
89740e9cb5 Prevent redisplay from moving point behind user's back
5932df7435 Document that the :match function for a widget takes an ex...
1b7ab9d0ac Don't render XML declaration of an HTML document (bug#44348)

# Conflicts:
#	lisp/international/mule.el
---

6b63b6669d51331381063781dd28bb02a26d3d04
diff --cc lisp/international/mule.el
index ad9c3a23066,c47f0722544..212e7232b49
--- a/lisp/international/mule.el
+++ b/lisp/international/mule.el
@@@ -855,11 -874,14 +855,14 @@@ VALUE is a CCL program name defined by 
  CCL program reads a character sequence and writes a byte sequence
  as an encoding result.
  
 -`:inhibit-nul-byte-detection'
 +`:inhibit-null-byte-detection'
  
- VALUE non-nil means Emacs ignore null bytes on code detection.
+ VALUE non-nil means Emacs should ignore null bytes on code detection.
 -See the variable `inhibit-nul-byte-detection'.  This attribute
 +See the variable `inhibit-null-byte-detection'.  This attribute
  is meaningful only when `:coding-type' is `undecided'.
+ If VALUE is t, Emacs will ignore null bytes unconditionally while
+ detecting encoding.  If VALUE is non-nil and not t, Emacs will
+ ignore null bytes if `inhibit-null-byte-detection' is non-nil.
  
  `:inhibit-iso-escape-detection'