diff options
Diffstat (limited to 'src')
| -rw-r--r-- | src/coding.c | 14 | ||||
| -rw-r--r-- | src/fns.c | 16 |
2 files changed, 28 insertions, 2 deletions
diff --git a/src/coding.c b/src/coding.c index d9964908dce..35d6be470c8 100644 --- a/src/coding.c +++ b/src/coding.c | |||
| @@ -9415,6 +9415,13 @@ code_convert_region (Lisp_Object start, Lisp_Object end, | |||
| 9415 | DEFUN ("decode-coding-region", Fdecode_coding_region, Sdecode_coding_region, | 9415 | DEFUN ("decode-coding-region", Fdecode_coding_region, Sdecode_coding_region, |
| 9416 | 3, 4, "r\nzCoding system: ", | 9416 | 3, 4, "r\nzCoding system: ", |
| 9417 | doc: /* Decode the current region from the specified coding system. | 9417 | doc: /* Decode the current region from the specified coding system. |
| 9418 | |||
| 9419 | What's meant by \"decoding\" is transforming bytes into text | ||
| 9420 | (characters). If, for instance, you have a region that contains data | ||
| 9421 | that represents the two bytes #xc2 #xa9, after calling this function | ||
| 9422 | with the utf-8 coding system, the region will contain the single | ||
| 9423 | character ?\\N{COPYRIGHT SIGN}. | ||
| 9424 | |||
| 9418 | When called from a program, takes four arguments: | 9425 | When called from a program, takes four arguments: |
| 9419 | START, END, CODING-SYSTEM, and DESTINATION. | 9426 | START, END, CODING-SYSTEM, and DESTINATION. |
| 9420 | START and END are buffer positions. | 9427 | START and END are buffer positions. |
| @@ -9438,6 +9445,13 @@ not fully specified.) */) | |||
| 9438 | DEFUN ("encode-coding-region", Fencode_coding_region, Sencode_coding_region, | 9445 | DEFUN ("encode-coding-region", Fencode_coding_region, Sencode_coding_region, |
| 9439 | 3, 4, "r\nzCoding system: ", | 9446 | 3, 4, "r\nzCoding system: ", |
| 9440 | doc: /* Encode the current region by specified coding system. | 9447 | doc: /* Encode the current region by specified coding system. |
| 9448 | |||
| 9449 | What's meant by \"encoding\" is transforming textual data (characters) | ||
| 9450 | into bytes. If, for instance, you have a region that contains the | ||
| 9451 | single character ?\\N{COPYRIGHT SIGN}, after calling this function with | ||
| 9452 | the utf-8 coding system, the data in the region will represent the two | ||
| 9453 | bytes #xc2 #xa9. | ||
| 9454 | |||
| 9441 | When called from a program, takes four arguments: | 9455 | When called from a program, takes four arguments: |
| 9442 | START, END, CODING-SYSTEM and DESTINATION. | 9456 | START, END, CODING-SYSTEM and DESTINATION. |
| 9443 | START and END are buffer positions. | 9457 | START and END are buffer positions. |
| @@ -3297,7 +3297,13 @@ static Lisp_Object base64_encode_string_1 (Lisp_Object, bool, | |||
| 3297 | DEFUN ("base64-encode-region", Fbase64_encode_region, Sbase64_encode_region, | 3297 | DEFUN ("base64-encode-region", Fbase64_encode_region, Sbase64_encode_region, |
| 3298 | 2, 3, "r", | 3298 | 2, 3, "r", |
| 3299 | doc: /* Base64-encode the region between BEG and END. | 3299 | doc: /* Base64-encode the region between BEG and END. |
| 3300 | Return the length of the encoded text. | 3300 | The data in the region is assumed to represent bytes, not text. If |
| 3301 | you want to base64-encode text, the text has to be converted into data | ||
| 3302 | first by using `encode-coding-region' with the appropriate coding | ||
| 3303 | system first. | ||
| 3304 | |||
| 3305 | Return the length of the encoded data. | ||
| 3306 | |||
| 3301 | Optional third argument NO-LINE-BREAK means do not break long lines | 3307 | Optional third argument NO-LINE-BREAK means do not break long lines |
| 3302 | into shorter lines. */) | 3308 | into shorter lines. */) |
| 3303 | (Lisp_Object beg, Lisp_Object end, Lisp_Object no_line_break) | 3309 | (Lisp_Object beg, Lisp_Object end, Lisp_Object no_line_break) |
| @@ -3544,7 +3550,13 @@ base64_encode_1 (const char *from, char *to, ptrdiff_t length, | |||
| 3544 | DEFUN ("base64-decode-region", Fbase64_decode_region, Sbase64_decode_region, | 3550 | DEFUN ("base64-decode-region", Fbase64_decode_region, Sbase64_decode_region, |
| 3545 | 2, 3, "r", | 3551 | 2, 3, "r", |
| 3546 | doc: /* Base64-decode the region between BEG and END. | 3552 | doc: /* Base64-decode the region between BEG and END. |
| 3547 | Return the length of the decoded text. | 3553 | Return the length of the decoded data. |
| 3554 | |||
| 3555 | Note that after calling this function, the data in the region will | ||
| 3556 | represent bytes, not text. If you want to end up with text, you have | ||
| 3557 | to call `decode-coding-region' afterwards with an appropriate coding | ||
| 3558 | system. | ||
| 3559 | |||
| 3548 | If the region can't be decoded, signal an error and don't modify the buffer. | 3560 | If the region can't be decoded, signal an error and don't modify the buffer. |
| 3549 | Optional third argument BASE64URL determines whether to use the URL variant | 3561 | Optional third argument BASE64URL determines whether to use the URL variant |
| 3550 | of the base 64 encoding, as defined in RFC 4648. */) | 3562 | of the base 64 encoding, as defined in RFC 4648. */) |