diff options
Diffstat (limited to 'src/coding.c')
| -rw-r--r-- | src/coding.c | 12 |
1 files changed, 7 insertions, 5 deletions
diff --git a/src/coding.c b/src/coding.c index 8ea518d3708..36376b83ede 100644 --- a/src/coding.c +++ b/src/coding.c | |||
| @@ -4528,7 +4528,7 @@ detect_coding_system (src, src_bytes, highest) | |||
| 4528 | if (VECTORP (val2)) | 4528 | if (VECTORP (val2)) |
| 4529 | val = XVECTOR (val2)->contents[eol_type]; | 4529 | val = XVECTOR (val2)->contents[eol_type]; |
| 4530 | } | 4530 | } |
| 4531 | return val; | 4531 | return (highest ? val : Fcons (val, Qnil)); |
| 4532 | } | 4532 | } |
| 4533 | 4533 | ||
| 4534 | /* At first, gather possible coding systems in VAL. */ | 4534 | /* At first, gather possible coding systems in VAL. */ |
| @@ -4567,8 +4567,9 @@ DEFUN ("detect-coding-region", Fdetect_coding_region, Sdetect_coding_region, | |||
| 4567 | "Detect coding system of the text in the region between START and END.\n\ | 4567 | "Detect coding system of the text in the region between START and END.\n\ |
| 4568 | Return a list of possible coding systems ordered by priority.\n\ | 4568 | Return a list of possible coding systems ordered by priority.\n\ |
| 4569 | \n\ | 4569 | \n\ |
| 4570 | If only ASCII characters are found, it returns `undecided'\n\ | 4570 | If only ASCII characters are found, it returns a list of single element\n\ |
| 4571 | or its subsidiary coding system according to a detected end-of-line format.\n\ | 4571 | `undecided' or its subsidiary coding system according to a detected\n\ |
| 4572 | end-of-line format.\n\ | ||
| 4572 | \n\ | 4573 | \n\ |
| 4573 | If optional argument HIGHEST is non-nil, return the coding system of\n\ | 4574 | If optional argument HIGHEST is non-nil, return the coding system of\n\ |
| 4574 | highest priority.") | 4575 | highest priority.") |
| @@ -4599,8 +4600,9 @@ DEFUN ("detect-coding-string", Fdetect_coding_string, Sdetect_coding_string, | |||
| 4599 | "Detect coding system of the text in STRING.\n\ | 4600 | "Detect coding system of the text in STRING.\n\ |
| 4600 | Return a list of possible coding systems ordered by priority.\n\ | 4601 | Return a list of possible coding systems ordered by priority.\n\ |
| 4601 | \n\ | 4602 | \n\ |
| 4602 | If only ASCII characters are found, it returns `undecided'\n\ | 4603 | If only ASCII characters are found, it returns a list of single element\n\ |
| 4603 | or its subsidiary coding system according to a detected end-of-line format.\n\ | 4604 | `undecided' or its subsidiary coding system according to a detected\n\ |
| 4605 | end-of-line format.\n\ | ||
| 4604 | \n\ | 4606 | \n\ |
| 4605 | If optional argument HIGHEST is non-nil, return the coding system of\n\ | 4607 | If optional argument HIGHEST is non-nil, return the coding system of\n\ |
| 4606 | highest priority.") | 4608 | highest priority.") |