diff options
| author | Andrea Corallo <akrl@sdf.org> | 2020-10-10 11:00:35 +0200 |
|---|---|---|
| committer | Andrea Corallo <akrl@sdf.org> | 2020-10-10 11:00:35 +0200 |
| commit | f7e7ff4fb16bf8fc8e7662f21cd9843e9eb648e8 (patch) | |
| tree | 8757f25ff7948b6b045bd60f5adf6ebf91ed75ee /lisp/international/mule.el | |
| parent | 138990bbda7ab228e3fde44710426c474b2c1086 (diff) | |
| parent | 5824c209ba17b97978519ea62478c57010311e88 (diff) | |
| download | emacs-f7e7ff4fb16bf8fc8e7662f21cd9843e9eb648e8.tar.gz | |
Merge remote-tracking branch 'savannah/master' into HEAD
Diffstat (limited to 'lisp/international/mule.el')
| -rw-r--r-- | lisp/international/mule.el | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/lisp/international/mule.el b/lisp/international/mule.el index 3edea7e7717..607287f59cd 100644 --- a/lisp/international/mule.el +++ b/lisp/international/mule.el @@ -856,10 +856,10 @@ VALUE is a CCL program name defined by `define-ccl-program'. The 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. -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'. `:inhibit-iso-escape-detection' @@ -904,7 +904,7 @@ non-ASCII files. This attribute is meaningful only when :ccl-encoder :valids)) ((eq coding-type 'undecided) - '(:inhibit-nul-byte-detection + '(:inhibit-null-byte-detection :inhibit-iso-escape-detection :prefer-utf-8)))))) |