summaryrefslogtreecommitdiff
path: root/lisp/international/mule.el
diff options
context:
space:
mode:
authorAndrea Corallo <akrl@sdf.org>2020-11-14 22:07:54 +0100
committerAndrea Corallo <akrl@sdf.org>2020-11-14 22:07:54 +0100
commit2a8bf2222dd5d786375c131aa13dd1ea6f0cf104 (patch)
tree4f69d049302a8144783ff697f6a73d7e3e585539 /lisp/international/mule.el
parentf702426780475309bdd33ef896d28dd33484246b (diff)
parentad29bc74ca9d4e1768698d4002b49c234624e359 (diff)
downloademacs-2a8bf2222dd5d786375c131aa13dd1ea6f0cf104.tar.gz
Merge remote-tracking branch 'savannah/master' into dev
Diffstat (limited to 'lisp/international/mule.el')
-rw-r--r--lisp/international/mule.el11
1 files changed, 9 insertions, 2 deletions
diff --git a/lisp/international/mule.el b/lisp/international/mule.el
index 5292abfb798..66abc98bfe7 100644
--- a/lisp/international/mule.el
+++ b/lisp/international/mule.el
@@ -858,16 +858,23 @@ as an encoding result.
`: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-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'
-VALUE non-nil means Emacs ignores ISO-2022 escape sequences on
+VALUE non-nil means Emacs should ignore ISO-2022 escape sequences on
code detection. See the variable `inhibit-iso-escape-detection'.
This attribute is meaningful only when `:coding-type' is
`undecided'.
+If VALUE is t, Emacs will ignore escape sequences unconditionally
+while detecting encoding. If VALUE is non-nil and not t, Emacs
+will ignore escape sequences if `inhibit-iso-escape-detection' is
+non-nil.
`:prefer-utf-8'