summaryrefslogtreecommitdiff
path: root/doc/lispref/nonascii.texi
diff options
context:
space:
mode:
authorGlenn Morris <rgm@gnu.org>2019-06-01 12:04:41 -0700
committerGlenn Morris <rgm@gnu.org>2019-06-01 12:04:41 -0700
commit17a1dae4af751c82e78991350559481e9fa42959 (patch)
tree9d913268de49269e6116a8d368910dd6883ddb03 /doc/lispref/nonascii.texi
parent1860b6d57bb51cff082d4cf596bdd054f493c4cd (diff)
parent2168165ec05aa663d41998adb518e778899a8edd (diff)
downloademacs-17a1dae4af751c82e78991350559481e9fa42959.tar.gz
Merge from origin/emacs-26
2168165 ; * doc/lispref/nonascii.texi (Explicit Encoding): Fix typo. 8f18d12 Improve documentation of decoding into a unibyte buffer 7681a57 Remove redundants "See" before @xref or @pxref (Bug#35793) 9bee762 ; * src/coding.c: Improve commentary. (Bug#34765) e61349c Fix customization type of recentf-max-saved-items # Conflicts: # src/coding.c
Diffstat (limited to 'doc/lispref/nonascii.texi')
-rw-r--r--doc/lispref/nonascii.texi9
1 files changed, 7 insertions, 2 deletions
diff --git a/doc/lispref/nonascii.texi b/doc/lispref/nonascii.texi
index 47206a406fd..8b0750abbf6 100644
--- a/doc/lispref/nonascii.texi
+++ b/doc/lispref/nonascii.texi
@@ -1912,7 +1912,10 @@ the command returns the decoded text as a multibyte string without
inserting it.
If decoded text is inserted in some buffer, this command returns the
-length of the decoded text.
+length of the decoded text. If that buffer is a unibyte buffer
+(@pxref{Selecting a Representation}), the internal representation of
+the decoded text (@pxref{Text Representations}) is inserted into the
+buffer as individual bytes.
This command puts a @code{charset} text property on the decoded text.
The value of the property states the character set used to decode the
@@ -1931,7 +1934,9 @@ contains 8-bit bytes in their multibyte form).
If optional argument @var{buffer} specifies a buffer, the decoded text
is inserted in that buffer after point (point does not move). In this
-case, the return value is the length of the decoded text.
+case, the return value is the length of the decoded text. If that
+buffer is a unibyte buffer, the internal representation of the decoded
+text is inserted into it as individual bytes.
@cindex @code{charset}, text property
This function puts a @code{charset} text property on the decoded text.