aboutsummaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorEli Zaretskii2008-10-21 15:57:30 +0000
committerEli Zaretskii2008-10-21 15:57:30 +0000
commit1560f91a925c564191cecb2ac3c95f5025c415cf (patch)
treecf500154cf44af7f1c85897309fcecfa1ca12647 /src
parentd2c52e26902c4510e9087dbf4b11603f5c5d3898 (diff)
downloademacs-1560f91a925c564191cecb2ac3c95f5025c415cf.tar.gz
emacs-1560f91a925c564191cecb2ac3c95f5025c415cf.zip
(Fencode_coding_region, Fdecode_coding_region)
(Fdecode_coding_string, Fencode_coding_string): Doc fix.
Diffstat (limited to 'src')
-rw-r--r--src/ChangeLog5
-rw-r--r--src/coding.c14
2 files changed, 13 insertions, 6 deletions
diff --git a/src/ChangeLog b/src/ChangeLog
index ed825a8e954..0a11f86292c 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,8 @@
12008-10-21 Eli Zaretskii <eliz@gnu.org>
2
3 * coding.c (Fencode_coding_region, Fdecode_coding_region)
4 (Fdecode_coding_string, Fencode_coding_string): Doc fix.
5
12008-10-21 Martin Rudalics <rudalics@gmx.at> 62008-10-21 Martin Rudalics <rudalics@gmx.at>
2 7
3 * buffer.c (Fget_buffer, Fbury_buffer, switch_to_buffer_1): 8 * buffer.c (Fget_buffer, Fbury_buffer, switch_to_buffer_1):
diff --git a/src/coding.c b/src/coding.c
index fb0bfa0b15c..ea0a066eb71 100644
--- a/src/coding.c
+++ b/src/coding.c
@@ -8442,7 +8442,8 @@ START and END are buffer positions.
8442 8442
8443Optional 4th arguments DESTINATION specifies where the decoded text goes. 8443Optional 4th arguments DESTINATION specifies where the decoded text goes.
8444If nil, the region between START and END is replaced by the decoded text. 8444If nil, the region between START and END is replaced by the decoded text.
8445If buffer, the decoded text is inserted in the buffer. 8445If buffer, the decoded text is inserted in that buffer after point (point
8446does not move).
8446In those cases, the length of the decoded text is returned. 8447In those cases, the length of the decoded text is returned.
8447If DESTINATION is t, the decoded text is returned. 8448If DESTINATION is t, the decoded text is returned.
8448 8449
@@ -8464,7 +8465,8 @@ START and END are buffer positions.
8464 8465
8465Optional 4th arguments DESTINATION specifies where the encoded text goes. 8466Optional 4th arguments DESTINATION specifies where the encoded text goes.
8466If nil, the region between START and END is replace by the encoded text. 8467If nil, the region between START and END is replace by the encoded text.
8467If buffer, the encoded text is inserted in the buffer. 8468If buffer, the encoded text is inserted in that buffer after point (point
8469does not move).
8468In those cases, the length of the encoded text is returned. 8470In those cases, the length of the encoded text is returned.
8469If DESTINATION is t, the encoded text is returned. 8471If DESTINATION is t, the encoded text is returned.
8470 8472
@@ -8544,8 +8546,8 @@ Optional third arg NOCOPY non-nil means it is OK to return STRING itself
8544if the decoding operation is trivial. 8546if the decoding operation is trivial.
8545 8547
8546Optional fourth arg BUFFER non-nil means that the decoded text is 8548Optional fourth arg BUFFER non-nil means that the decoded text is
8547inserted in BUFFER instead of returned as a string. In this case, 8549inserted in that buffer after point (point does not move). In this
8548the return value is the length of the decoded text. 8550case, the return value is the length of the decoded text.
8549 8551
8550This function sets `last-coding-system-used' to the precise coding system 8552This function sets `last-coding-system-used' to the precise coding system
8551used (which may be different from CODING-SYSTEM if CODING-SYSTEM is 8553used (which may be different from CODING-SYSTEM if CODING-SYSTEM is
@@ -8565,8 +8567,8 @@ Optional third arg NOCOPY non-nil means it is OK to return STRING
8565itself if the encoding operation is trivial. 8567itself if the encoding operation is trivial.
8566 8568
8567Optional fourth arg BUFFER non-nil means that the encoded text is 8569Optional fourth arg BUFFER non-nil means that the encoded text is
8568inserted in BUFFER instead of returned as a string. In this case, 8570inserted in that buffer after point (point does not move). In this
8569the return value is the length of the encoded text. 8571case, the return value is the length of the encoded text.
8570 8572
8571This function sets `last-coding-system-used' to the precise coding system 8573This function sets `last-coding-system-used' to the precise coding system
8572used (which may be different from CODING-SYSTEM if CODING-SYSTEM is 8574used (which may be different from CODING-SYSTEM if CODING-SYSTEM is